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

Merge "apex: Make android_library support APEX variants"

Browse Source
This commit is contained in:
Jooyung Han
2020-05-21 12:02:39 +00:00
committed by Gerrit Code Review
parent 7d74b5f142 acc7bbebe4
commit 5ab5856db3
3 changed files with 46 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
apex/apex.go
View File

@@ -287,7 +287,10 @@ func makeApexAvailableWhitelist() map[string][]string {
"android.hidl.token@1.0",
"android.hidl.token@1.0-utils",
"bionic_libc_platform_headers",
"exoplayer2-extractor",
"exoplayer2-extractor-annotation-stubs",
"gl_headers",
"jsr305",
"libEGL",
"libEGL_blobCache",
"libEGL_getProcAddress",
@@ -542,12 +545,6 @@ func makeApexAvailableWhitelist() map[string][]string {
// Module separator
//
m["com.android.permission"] = []string{
"androidx.annotation_annotation",
"androidx.annotation_annotation-nodeps",
"androidx.lifecycle_lifecycle-common",
"androidx.lifecycle_lifecycle-common-java8",
"androidx.lifecycle_lifecycle-common-java8-nodeps",
"androidx.lifecycle_lifecycle-common-nodeps",
"kotlin-annotations",
"kotlin-stdlib",
"kotlin-stdlib-jdk7",
@@ -618,13 +615,21 @@ func makeApexAvailableWhitelist() map[string][]string {
// Module separator
//
m["com.android.tethering"] = []string{
"libnativehelper_compat_libc++",
"android.hardware.tetheroffload.config@1.0",
"android.hardware.tetheroffload.config-V1.0-java",
"android.hardware.tetheroffload.control-V1.0-java",
"android.hidl.base-V1.0-java",
"ipmemorystore-aidl-interfaces-java",
"libcgrouprc",
"libcgrouprc_format",
"libnativehelper_compat_libc++",
"libtetherutilsjni",
"libvndksupport",
"net-utils-framework-common",
"netd_aidl_interface-V3-java",
"netlink-client",
"networkstack-aidl-interfaces-java",
"tethering-aidl-interfaces-java",
"TetheringApiCurrentLib",
}
//
// Module separator
@@ -648,8 +653,6 @@ func makeApexAvailableWhitelist() map[string][]string {
"android.hidl.manager-V1.0-java",
"android.hidl.manager-V1.1-java",
"android.hidl.manager-V1.2-java",
"androidx.annotation_annotation",
"androidx.annotation_annotation-nodeps",
"bouncycastle-unbundled",
"dnsresolver_aidl_interface-V2-java",
"error_prone_annotations",
@@ -671,7 +674,6 @@ func makeApexAvailableWhitelist() map[string][]string {
"wifi-nano-protos",
"wifi-service-pre-jarjar",
"wifi-service-resources",
"prebuilt_androidx.annotation_annotation-nodeps",
}
//
// Module separator
@@ -691,6 +693,15 @@ func makeApexAvailableWhitelist() map[string][]string {
// Module separator
//
m[android.AvailableToAnyApex] = []string{
// TODO(b/156996905) Set apex_available/min_sdk_version for androidx/extras support libraries
"androidx",
"androidx-constraintlayout_constraintlayout",
"androidx-constraintlayout_constraintlayout-nodeps",
"androidx-constraintlayout_constraintlayout-solver",
"androidx-constraintlayout_constraintlayout-solver-nodeps",
"com.google.android.material_material",
"com.google.android.material_material-nodeps",
"libatomic",
"libclang_rt",
"libgcc_stripped",
@@ -2294,6 +2305,10 @@ func normalizeModuleName(moduleName string) string {
// We don't want to list them all
moduleName = "libclang_rt"
}
if strings.HasPrefix(moduleName, "androidx.") {
// TODO(b/156996905) Set apex_available/min_sdk_version for androidx support libraries
moduleName = "androidx"
}
return moduleName
}