Merge "Propagate recovery_available property through to sdk snapshot" am: 05175c405b am: cd1c4bb58b am: 9cabaa47ad am: 00e9b68322

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

Change-Id: I86b3ecfa148ea30d5e9f36eff98f67ae8bea3a53

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.Properties.Recovery_available) {
+		pbm.AddProperty("recovery_available", true)
+	}
+
 	if proptools.Bool(ccModule.VendorProperties.Vendor_available) {
 		pbm.AddProperty("vendor_available", true)
 	}

sdk/cc_sdk_test.go

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