Remove access to internal dex libs for com.android.runtime.
Test: Build & boot
Bug: 142944931
Bug: 151466650
Change-Id: I2844d372c0d46ec8dffcbad1812a6ea944c6fe9c
diff --git a/libartbase/Android.bp b/libartbase/Android.bp
index a9f9918..c110315 100644
--- a/libartbase/Android.bp
+++ b/libartbase/Android.bp
@@ -176,11 +176,6 @@
apex_available: [
"com.android.art.release",
"com.android.art.debug",
- // due to the transitive dependency from linker:
- // linker -> libdebuggerd_handler_fallback -> libdexfile_support_static -> libdexfile
- // libartbase
- // TODO(b/142944931): remove this
- "com.android.runtime",
// 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 5555017..e85fb83 100644
--- a/libdexfile/Android.bp
+++ b/libdexfile/Android.bp
@@ -177,8 +177,6 @@
apex_available: [
"com.android.art.release",
"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",
@@ -311,8 +309,6 @@
apex_available: [
"com.android.art.release",
"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",
@@ -410,9 +406,8 @@
name: "libdexfile_support_static",
visibility: [
"//art:__subpackages__",
- // TODO(b/133140750): Clean this up.
- "//system/core/debuggerd",
- "//system/core/init", // Dependency from Android.mk file, so not enforced.
+ // Required for the simpleperf binary in the NDK. No other modules than
+ // //system/extras/simpleperf:simpleperf_ndk are allowed to use it.
"//system/extras/simpleperf",
],
defaults: [