Merge "Propagate vendor_available property through to sdk snapshot" am: 4964a5e000 am: 4d38789695 am: 88653d7b56

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1398472

Change-Id: I4322c631dfecfef4267230fe84578322b772ac6e

cc/library_sdk_member.go

@@ -119,6 +119,10 @@ func (mt *librarySdkMemberType) AddPrebuiltModule(ctx android.SdkMemberContext,
 
 	ccModule := member.Variants()[0].(*Module)
 
+	if proptools.Bool(ccModule.VendorProperties.Vendor_available) {
+		pbm.AddProperty("vendor_available", true)
+	}
+
 	sdkVersion := ccModule.SdkVersion()
 	if sdkVersion != "" {
 		pbm.AddProperty("sdk_version", sdkVersion)

sdk/cc_sdk_test.go

@@ -1672,6 +1672,7 @@ func TestSnapshotWithCcLibrary(t *testing.T) {
 			],
 			export_include_dirs: ["include"],
 			stl: "none",
+			vendor_available: true,
 		}
 	`)
 
@@ -1683,6 +1684,7 @@ cc_prebuilt_library {
     name: "myexports_mynativelib@current",
     sdk_member_name: "mynativelib",
     installable: false,
+    vendor_available: true,
     stl: "none",
     compile_multilib: "both",
     export_include_dirs: ["include/include"],
@@ -1709,6 +1711,7 @@ cc_prebuilt_library {
 cc_prebuilt_library {
     name: "mynativelib",
     prefer: false,
+    vendor_available: true,
     stl: "none",
     compile_multilib: "both",
     export_include_dirs: ["include/include"],