StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Propagate vendor_available property through to sdk snapshot

Browse Source 
Test: m nothing
Change-Id: I68dcba111d290ae8a84c2bc023e1a4e0eaa43408
This commit is contained in:
Paul Duffin
2020-08-13 19:45:31 +01:00
parent 3f98d148df
commit d1edbd4eed
2 changed files with 7 additions and 0 deletions
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) ccModule := member.Variants()[0].(*Module)
if proptools.Bool(ccModule.VendorProperties.Vendor_available) {
pbm.AddProperty("vendor_available", true)
}
sdkVersion := ccModule.SdkVersion() sdkVersion := ccModule.SdkVersion()
if sdkVersion != "" { if sdkVersion != "" {
pbm.AddProperty("sdk_version", 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"], export_include_dirs: ["include"],
stl: "none", stl: "none",
vendor_available: true,
} }
`) `)
@@ -1683,6 +1684,7 @@ cc_prebuilt_library {
name: "myexports_mynativelib@current", name: "myexports_mynativelib@current",
sdk_member_name: "mynativelib", sdk_member_name: "mynativelib",
installable: false, installable: false,
vendor_available: true,
stl: "none", stl: "none",
compile_multilib: "both", compile_multilib: "both",
export_include_dirs: ["include/include"], export_include_dirs: ["include/include"],
@@ -1709,6 +1711,7 @@ cc_prebuilt_library {
cc_prebuilt_library { cc_prebuilt_library {
name: "mynativelib", name: "mynativelib",
prefer: false, prefer: false,
vendor_available: true,
stl: "none", stl: "none",
compile_multilib: "both", compile_multilib: "both",
export_include_dirs: ["include/include"], export_include_dirs: ["include/include"],