tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Propagate vendor_available property through to sdk snapshot"

Browse source
This commit is contained in:
Paul Duffin 2020-09-07 14:58:20 +00:00 committed by Gerrit Code Review
commit 4964a5e000
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cc/library_sdk_member.go
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)

3
sdk/cc_sdk_test.go
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"],