Fix snapshot of a host/device cc_library with stubs
Adds a test that fails with unknown property android.stubs.versions and then fixes that by marking the field from which that property is created with 'ignored-on-host' and implemented the isHostVariant on *osTypeSpecificInfo. Bug: 155628860 Test: m nothing Change-Id: I167b47a1374f541aa09d7e045972d740f1d9009c
This commit is contained in:
@@ -1805,3 +1805,86 @@ sdk_snapshot {
|
||||
}
|
||||
`))
|
||||
}
|
||||
|
||||
func TestDeviceAndHostSnapshotWithStubsLibrary(t *testing.T) {
|
||||
result := testSdkWithCc(t, `
|
||||
sdk {
|
||||
name: "mysdk",
|
||||
host_supported: true,
|
||||
native_shared_libs: ["stubslib"],
|
||||
}
|
||||
|
||||
cc_library {
|
||||
name: "internaldep",
|
||||
host_supported: true,
|
||||
}
|
||||
|
||||
cc_library {
|
||||
name: "stubslib",
|
||||
host_supported: true,
|
||||
shared_libs: ["internaldep"],
|
||||
stubs: {
|
||||
symbol_file: "some/where/stubslib.map.txt",
|
||||
versions: ["1", "2", "3"],
|
||||
},
|
||||
}
|
||||
`)
|
||||
|
||||
result.CheckSnapshot("mysdk", "",
|
||||
checkAndroidBpContents(`
|
||||
// This is auto-generated. DO NOT EDIT.
|
||||
|
||||
cc_prebuilt_library_shared {
|
||||
name: "mysdk_stubslib@current",
|
||||
sdk_member_name: "stubslib",
|
||||
host_supported: true,
|
||||
installable: false,
|
||||
stubs: {
|
||||
versions: ["3"],
|
||||
},
|
||||
target: {
|
||||
android_arm64: {
|
||||
srcs: ["android/arm64/lib/stubslib.so"],
|
||||
},
|
||||
android_arm: {
|
||||
srcs: ["android/arm/lib/stubslib.so"],
|
||||
},
|
||||
linux_glibc_x86_64: {
|
||||
srcs: ["linux_glibc/x86_64/lib/stubslib.so"],
|
||||
},
|
||||
linux_glibc_x86: {
|
||||
srcs: ["linux_glibc/x86/lib/stubslib.so"],
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
cc_prebuilt_library_shared {
|
||||
name: "stubslib",
|
||||
prefer: false,
|
||||
host_supported: true,
|
||||
stubs: {
|
||||
versions: ["3"],
|
||||
},
|
||||
target: {
|
||||
android_arm64: {
|
||||
srcs: ["android/arm64/lib/stubslib.so"],
|
||||
},
|
||||
android_arm: {
|
||||
srcs: ["android/arm/lib/stubslib.so"],
|
||||
},
|
||||
linux_glibc_x86_64: {
|
||||
srcs: ["linux_glibc/x86_64/lib/stubslib.so"],
|
||||
},
|
||||
linux_glibc_x86: {
|
||||
srcs: ["linux_glibc/x86/lib/stubslib.so"],
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
sdk_snapshot {
|
||||
name: "mysdk@current",
|
||||
host_supported: true,
|
||||
native_shared_libs: ["mysdk_stubslib@current"],
|
||||
}
|
||||
`))
|
||||
}
|
||||
|
Reference in New Issue
Block a user