commit b3ff3683f4bb5ec053374f98baed2d05e8a83c18
author Martin Stjernholm <mast@google.com> Tue Mar 31 16:29:49 2020 +0100
committer TreeHugger Robot <treehugger-gerrit@google.com> Thu Apr 16 08:03:45 2020 +0000
tree efc61943f76fcbae9a6764737831db94f84cd93f
parent 0bd94e59a21bbd862e179974538b3293eb24c26d

Remove platform availability from internal libs that make up
libdexfile_support_static.

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
Change-Id: I159f6180bdbd8d50e2cb8d32049cc283f0a04467
Merged-In: I159f6180bdbd8d50e2cb8d32049cc283f0a04467

libartbase/Android.bp

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: [

libartpalette/Android.bp

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",
     ],
 }
 

libdexfile/Android.bp

diff --git a/libdexfile/Android.bp b/libdexfile/Android.bp
index a36a859..6ffd6fe 100644
--- a/libdexfile/Android.bp
+++ b/libdexfile/Android.bp
@@ -177,9 +177,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",
     ],
 }
 
@@ -311,9 +308,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",
     ],
 }