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

Merge "Propagate recovery_available property through to sdk snapshot"

Browse Source
This commit is contained in:
Treehugger Robot
2020-09-11 21:16:07 +00:00
committed by Gerrit Code Review
parent 570b81ab01 d6abaa71f8
commit 05175c405b
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.Properties.Recovery_available) {
pbm.AddProperty("recovery_available", true)
}
if proptools.Bool(ccModule.VendorProperties.Vendor_available) { if proptools.Bool(ccModule.VendorProperties.Vendor_available) {
pbm.AddProperty("vendor_available", true) pbm.AddProperty("vendor_available", true)
} }

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",
recovery_available: true,
vendor_available: true, vendor_available: true,
} }
`) `)
@@ -1684,6 +1685,7 @@ cc_prebuilt_library {
name: "myexports_mynativelib@current", name: "myexports_mynativelib@current",
sdk_member_name: "mynativelib", sdk_member_name: "mynativelib",
installable: false, installable: false,
recovery_available: true,
vendor_available: true, vendor_available: true,
stl: "none", stl: "none",
compile_multilib: "both", compile_multilib: "both",
@@ -1711,6 +1713,7 @@ cc_prebuilt_library {
cc_prebuilt_library { cc_prebuilt_library {
name: "mynativelib", name: "mynativelib",
prefer: false, prefer: false,
recovery_available: true,
vendor_available: true, vendor_available: true,
stl: "none", stl: "none",
compile_multilib: "both", compile_multilib: "both",