Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6abaa71 authored by Paul Duffin's avatar Paul Duffin
Browse files

Propagate recovery_available property through to sdk snapshot 

Needed for jni_headers which is marked as recovery_available because libchrome
is also marked and that library is used by others that are the recovery
partition. There may be other dependency paths that require jni_headers to be
recovery_available that was just the first one found.

Bug: 168301990
Test: m nothing
Change-Id: I916ecfe7700b9c153b29115e849da148fc7e7a76
parent ee9ad5d5

cc/library_sdk_member.go

+4 −0
Original line number Diff line number Diff line
@@ -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

+3 −0
Original line number Diff line number Diff line
@@ -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",