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

Define product_available property

Browse Source 
To make a module available to product variants, it must define
`product_available: true`. `vendor_available: true` will not create
product variants any more.
However, in this CL, we don't change the behavior of
`vendor_available` property. It still creates both variants. After we
update all Android.bp files that need to provide product variants
with `product_available: true`, we may upload the remaining patches.

Bug: 150902910
Test: lunch aosp_arm64-userdebug && m
Change-Id: I0fd5be7bbae2c45d5cab3c3c2ca49f53a9b6f975
This commit is contained in:
Justin Yun
2020-10-29 16:49:43 +09:00
parent b0a713acf9
commit 63e9ec70bb
16 changed files with 344 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
cc/testing.go
View File

@@ -40,6 +40,7 @@ func GatherRequiredDepsForTest(oses ...android.OsType) string {
name: "libatomic",
defaults: ["linux_bionic_supported"],
vendor_available: true,
product_available: true,
recovery_available: true,
native_bridge_supported: true,
src: "",
@@ -48,6 +49,7 @@ func GatherRequiredDepsForTest(oses ...android.OsType) string {
toolchain_library {
name: "libcompiler_rt-extras",
vendor_available: true,
product_available: true,
recovery_available: true,
src: "",
}
@@ -55,6 +57,7 @@ func GatherRequiredDepsForTest(oses ...android.OsType) string {
toolchain_library {
name: "libclang_rt.builtins-arm-android",
vendor_available: true,
product_available: true,
recovery_available: true,
native_bridge_supported: true,
src: "",
@@ -63,6 +66,7 @@ func GatherRequiredDepsForTest(oses ...android.OsType) string {
toolchain_library {
name: "libclang_rt.builtins-aarch64-android",
vendor_available: true,
product_available: true,
recovery_available: true,
native_bridge_supported: true,
src: "",
@@ -72,6 +76,7 @@ func GatherRequiredDepsForTest(oses ...android.OsType) string {
name: "libclang_rt.hwasan-aarch64-android",
nocrt: true,
vendor_available: true,
product_available: true,
recovery_available: true,
system_shared_libs: [],
stl: "none",
@@ -85,6 +90,7 @@ func GatherRequiredDepsForTest(oses ...android.OsType) string {
toolchain_library {
name: "libclang_rt.builtins-i686-android",
vendor_available: true,
product_available: true,
recovery_available: true,
native_bridge_supported: true,
src: "",
@@ -94,6 +100,7 @@ func GatherRequiredDepsForTest(oses ...android.OsType) string {
name: "libclang_rt.builtins-x86_64-android",
defaults: ["linux_bionic_supported"],
vendor_available: true,
product_available: true,
recovery_available: true,
native_bridge_supported: true,
src: "",
@@ -102,6 +109,7 @@ func GatherRequiredDepsForTest(oses ...android.OsType) string {
toolchain_library {
name: "libclang_rt.fuzzer-arm-android",
vendor_available: true,
product_available: true,
recovery_available: true,
src: "",
}
@@ -109,6 +117,7 @@ func GatherRequiredDepsForTest(oses ...android.OsType) string {
toolchain_library {
name: "libclang_rt.fuzzer-aarch64-android",
vendor_available: true,
product_available: true,
recovery_available: true,
src: "",
}
@@ -116,6 +125,7 @@ func GatherRequiredDepsForTest(oses ...android.OsType) string {
toolchain_library {
name: "libclang_rt.fuzzer-i686-android",
vendor_available: true,
product_available: true,
recovery_available: true,
src: "",
}
@@ -124,6 +134,7 @@ func GatherRequiredDepsForTest(oses ...android.OsType) string {
name: "libclang_rt.fuzzer-x86_64-android",
defaults: ["linux_bionic_supported"],
vendor_available: true,
product_available: true,
recovery_available: true,
src: "",
}
@@ -131,6 +142,7 @@ func GatherRequiredDepsForTest(oses ...android.OsType) string {
toolchain_library {
name: "libclang_rt.fuzzer-x86_64",
vendor_available: true,
product_available: true,
recovery_available: true,
src: "",
}
@@ -139,6 +151,7 @@ func GatherRequiredDepsForTest(oses ...android.OsType) string {
cc_prebuilt_library_shared {
name: "libclang_rt.ubsan_standalone-aarch64-android",
vendor_available: true,
product_available: true,
recovery_available: true,
system_shared_libs: [],
srcs: [""],
@@ -148,6 +161,7 @@ func GatherRequiredDepsForTest(oses ...android.OsType) string {
name: "libgcc",
defaults: ["linux_bionic_supported"],
vendor_available: true,
product_available: true,
recovery_available: true,
src: "",
}
@@ -156,6 +170,7 @@ func GatherRequiredDepsForTest(oses ...android.OsType) string {
name: "libgcc_stripped",
defaults: ["linux_bionic_supported"],
vendor_available: true,
product_available: true,
recovery_available: true,
sdk_version: "current",
src: "",
@@ -173,7 +188,7 @@ func GatherRequiredDepsForTest(oses ...android.OsType) string {
versions: ["27", "28", "29"],
},
llndk_stubs: "libc.llndk",
}
}
llndk_library {
name: "libc.llndk",
symbol_file: "",
@@ -206,6 +221,7 @@ func GatherRequiredDepsForTest(oses ...android.OsType) string {
cc_library {
name: "libprofile-extras",
vendor_available: true,
product_available: true,
recovery_available: true,
native_coverage: false,
system_shared_libs: [],
@@ -215,6 +231,7 @@ func GatherRequiredDepsForTest(oses ...android.OsType) string {
cc_library {
name: "libprofile-clang-extras",
vendor_available: true,
product_available: true,
recovery_available: true,
native_coverage: false,
system_shared_libs: [],
@@ -224,6 +241,7 @@ func GatherRequiredDepsForTest(oses ...android.OsType) string {
cc_library {
name: "libprofile-extras_ndk",
vendor_available: true,
product_available: true,
native_coverage: false,
system_shared_libs: [],
stl: "none",
@@ -233,6 +251,7 @@ func GatherRequiredDepsForTest(oses ...android.OsType) string {
cc_library {
name: "libprofile-clang-extras_ndk",
vendor_available: true,
product_available: true,
native_coverage: false,
system_shared_libs: [],
stl: "none",
@@ -283,6 +302,7 @@ func GatherRequiredDepsForTest(oses ...android.OsType) string {
system_shared_libs: [],
stl: "none",
vendor_available: true,
product_available: true,
recovery_available: true,
host_supported: true,
min_sdk_version: "29",
@@ -298,6 +318,7 @@ func GatherRequiredDepsForTest(oses ...android.OsType) string {
system_shared_libs: [],
stl: "none",
vendor_available: true,
product_available: true,
recovery_available: true,
host_supported: true,
min_sdk_version: "29",
@@ -318,6 +339,7 @@ func GatherRequiredDepsForTest(oses ...android.OsType) string {
stl: "none",
host_supported: false,
vendor_available: true,
product_available: true,
recovery_available: true,
min_sdk_version: "29",
apex_available: [
@@ -332,6 +354,7 @@ func GatherRequiredDepsForTest(oses ...android.OsType) string {
system_shared_libs: [],
stl: "none",
vendor_available: true,
product_available: true,
recovery_available: true,
}
@@ -340,6 +363,7 @@ func GatherRequiredDepsForTest(oses ...android.OsType) string {
defaults: ["linux_bionic_supported"],
recovery_available: true,
vendor_available: true,
product_available: true,
native_bridge_supported: true,
stl: "none",
min_sdk_version: "16",