Drop redundant libraries from baseline apexAvailable map
These libraries now set the correct apex_available in their Android.bp
files. Therefore, they do not a separate entry in the baseline
apexAvailable map.
Test: m nothing #passes
Bug: 281077552
Change-Id: Icf6b97c3bcc4bda96eefa14ba6d4bf10614bc378
diff --git a/apex/apex.go b/apex/apex.go
index e30f674..73265d2 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -3233,7 +3233,6 @@
//
m["com.android.appsearch"] = []string{
"icing-java-proto-lite",
- "libprotobuf-java-lite",
}
//
// Module separator
@@ -3249,11 +3248,8 @@
// Module separator
//
m["com.android.extservices"] = []string{
- "error_prone_annotations",
"ExtServices-core",
- "ExtServices",
"libtextclassifier-java",
- "libz_current",
"textclassifier-statsd",
"TextClassifierNotificationLibNoManifest",
"TextClassifierServiceLibNoManifest",
@@ -3271,8 +3267,6 @@
"android.hidl.memory@1.0",
"android.hidl.safe_union@1.0",
"libarect",
- "libbuildversion",
- "libmath",
"libprocpartition",
}
//
@@ -3302,15 +3296,12 @@
// Module separator
//
m["com.android.runtime"] = []string{
- "bionic_libc_platform_headers",
- "libarm-optimized-routines-math",
"libc_aeabi",
"libc_bionic",
"libc_bionic_ndk",
"libc_bootstrap",
"libc_common",
"libc_common_shared",
- "libc_common_static",
"libc_dns",
"libc_dynamic_dispatch",
"libc_fortify",
@@ -3327,19 +3318,16 @@
"libc_openbsd_large_stack",
"libc_openbsd_ndk",
"libc_pthread",
- "libc_static_dispatch",
"libc_syscalls",
"libc_tzcode",
"libc_unwind_static",
"libdebuggerd",
"libdebuggerd_common_headers",
"libdebuggerd_handler_core",
- "libdebuggerd_handler_fallback",
"libdl_static",
"libjemalloc5",
"liblinker_main",
"liblinker_malloc",
- "liblz4",
"liblzma",
"libprocinfo",
"libpropertyinfoparser",
@@ -3357,17 +3345,7 @@
m["com.android.tethering"] = []string{
"android.hardware.tetheroffload.config-V1.0-java",
"android.hardware.tetheroffload.control-V1.0-java",
- "android.hidl.base-V1.0-java",
- "libcgrouprc",
- "libcgrouprc_format",
- "libtetherutilsjni",
- "libvndksupport",
"net-utils-framework-common",
- "netd_aidl_interface-V3-java",
- "netlink-client",
- "networkstack-aidl-interfaces-java",
- "tethering-aidl-interfaces-java",
- "TetheringApiCurrentLib",
}
//
// Module separator
@@ -3387,48 +3365,22 @@
"android.hardware.wifi.supplicant-V1.1-java",
"android.hardware.wifi.supplicant-V1.2-java",
"android.hardware.wifi.supplicant-V1.3-java",
- "android.hidl.base-V1.0-java",
- "android.hidl.manager-V1.0-java",
- "android.hidl.manager-V1.1-java",
- "android.hidl.manager-V1.2-java",
"bouncycastle-unbundled",
- "dnsresolver_aidl_interface-V2-java",
- "error_prone_annotations",
- "framework-wifi-pre-jarjar",
"framework-wifi-util-lib",
- "ipmemorystore-aidl-interfaces-V3-java",
- "ipmemorystore-aidl-interfaces-java",
"ksoap2",
"libnanohttpd",
- "libwifi-jni",
- "net-utils-services-common",
- "netd_aidl_interface-V2-java",
- "netd_aidl_interface-unstable-java",
- "netd_event_listener_interface-java",
- "netlink-client",
- "networkstack-client",
- "services.net",
"wifi-lite-protos",
"wifi-nano-protos",
"wifi-service-pre-jarjar",
- "wifi-service-resources",
- }
- //
- // Module separator
- //
- m["com.android.os.statsd"] = []string{
- "libstatssocket",
}
//
// Module separator
//
m[android.AvailableToAnyApex] = []string{
- "libclang_rt",
"libprofile-clang-extras",
"libprofile-clang-extras_ndk",
"libprofile-extras",
"libprofile-extras_ndk",
- "libunwind",
}
return m
}
diff --git a/apex/apex_test.go b/apex/apex_test.go
index 3ba4d8d..c4708a8 100644
--- a/apex/apex_test.go
+++ b/apex/apex_test.go
@@ -1460,6 +1460,10 @@
sanitize: {
never: true,
},
+ apex_available: [
+ "//apex_available:anyapex",
+ "//apex_available:platform",
+ ],
} `)
ctx := result.TestContext
@@ -1508,6 +1512,10 @@
sanitize: {
never: true,
},
+ apex_available: [
+ "//apex_available:anyapex",
+ "//apex_available:platform",
+ ],
}
`)
ctx := result.TestContext
diff --git a/cc/testing.go b/cc/testing.go
index ced0929..d346739 100644
--- a/cc/testing.go
+++ b/cc/testing.go
@@ -82,6 +82,10 @@
sanitize: {
never: true,
},
+ apex_available: [
+ "//apex_available:anyapex",
+ "//apex_available:platform",
+ ],
}
cc_prebuilt_library_static {