diff --git a/cc/library_sdk_member.go b/cc/library_sdk_member.go index 665a64948..c6b0bf0ff 100644 --- a/cc/library_sdk_member.go +++ b/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) diff --git a/sdk/cc_sdk_test.go b/sdk/cc_sdk_test.go index 84b905c9d..0811ef530 100644 --- a/sdk/cc_sdk_test.go +++ b/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"],