Reland "Remove platform availability from internal libs that make up
libdexfile_support_static."
Reland of https://r.android.com/1273016 after fixing internal branch in
ag/11063995.
init and debuggerd no longer depends on libunwindstack with DEX support
(https://r.android.com/1149620), and with the fix for NOTICE targets on
static libs (https://r.android.com/1274763) it is not needed for
simpleperf_ndk either.
Test: Build & boot
Test:
$ m libdexfile libartbase libartpalette
$ find out/target/product/*/system -name libdexfile.so -o -name libartbase.so -o -name libartpalette.so
(no hits found)
Bug: 151466650
Bug: 142944931
Bug: 154165728
Change-Id: I5be00be19f3b9719e220c655aa25581d28c47245
diff --git a/libartbase/Android.bp b/libartbase/Android.bp
index c110315..8e33752 100644
--- a/libartbase/Android.bp
+++ b/libartbase/Android.bp
@@ -176,9 +176,6 @@
apex_available: [
"com.android.art.release",
"com.android.art.debug",
- // TODO(b/142944931) Clean this up. This is due to the dependency to libdexfile_support_static
- // from /system/core, etc.
- "//apex_available:platform",
],
shared_libs: [
diff --git a/libartpalette/Android.bp b/libartpalette/Android.bp
index 63abfe2..b4b2e0b 100644
--- a/libartpalette/Android.bp
+++ b/libartpalette/Android.bp
@@ -92,9 +92,6 @@
"com.android.art.debug",
// TODO(b/142944931): remove this
"com.android.runtime", // due to the transitive dependency from linker
- // TODO(b/142944931) Clean this up. This is due to the dependency to libdexfile_support_static
- // from /system/core, etc.
- "//apex_available:platform",
],
}
diff --git a/libdexfile/Android.bp b/libdexfile/Android.bp
index d9e1ada..664fc1b 100644
--- a/libdexfile/Android.bp
+++ b/libdexfile/Android.bp
@@ -178,9 +178,6 @@
apex_available: [
"com.android.art.release",
"com.android.art.debug",
- // TODO(b/142944931) Clean this up. This is due to the dependency to libdexfile_support_static
- // from /system/core, etc.
- "//apex_available:platform",
],
}
@@ -317,9 +314,6 @@
apex_available: [
"com.android.art.release",
"com.android.art.debug",
- // TODO(b/142944931) Clean this up. This is due to the dependency to libdexfile_support_static
- // from /system/core, etc.
- "//apex_available:platform",
],
}