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

Copy sdk_version to cc library snapshots

Browse Source 
Bug: 142935992
Bug: 153306490
Test: m nothing
Merged-In: Ib77c548b1971c841749c87115108af8b092bb809
Change-Id: Ib77c548b1971c841749c87115108af8b092bb809
This commit is contained in:
Paul Duffin
2020-03-05 14:09:58 +00:00
parent d76209b690
commit 8fa6acf002
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cc/library_sdk_member.go
View File

@@ -97,6 +97,13 @@ func (mt *librarySdkMemberType) IsInstance(module android.Module) bool {
func (mt *librarySdkMemberType) AddPrebuiltModule(sdkModuleContext android.ModuleContext, builder android.SnapshotBuilder, member android.SdkMember) android.BpModule {
pbm := builder.AddPrebuiltModule(member, mt.prebuiltModuleType)
ccModule := member.Variants()[0].(*Module)
sdkVersion := ccModule.SdkVersion()
if sdkVersion != "" {
pbm.AddProperty("sdk_version", sdkVersion)
}
return pbm
}

3
sdk/cc_sdk_test.go
View File

@@ -517,6 +517,7 @@ func TestHostSnapshotWithCcSharedLibrary(t *testing.T) {
},
system_shared_libs: [],
stl: "none",
sdk_version: "minimum",
}
`)
@@ -529,6 +530,7 @@ cc_prebuilt_library_shared {
sdk_member_name: "mynativelib",
device_supported: false,
host_supported: true,
sdk_version: "minimum",
export_include_dirs: ["include/include"],
arch: {
x86_64: {
@@ -549,6 +551,7 @@ cc_prebuilt_library_shared {
prefer: false,
device_supported: false,
host_supported: true,
sdk_version: "minimum",
export_include_dirs: ["include/include"],
arch: {
x86_64: {