Merge "Propagate vendor_available property through to sdk snapshot" am: 4964a5e000

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

Change-Id: I913a8e3cfd7eebb0a53ecd591b1bf12f69fa00b2
This commit is contained in:
Paul Duffin
2020-09-07 15:20:07 +00:00
committed by Automerger Merge Worker
2 changed files with 7 additions and 0 deletions

View File

@@ -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)

View File

@@ -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"],