commit 02e6a6ffa2ea384e13d179f237fb329b0b495682
author Ady Abraham <adyabr@google.com> Thu Apr 16 00:21:57 2020 +0000
committer Ady Abraham <adyabr@google.com> Thu Apr 16 00:21:57 2020 +0000
tree d0ff9a95a6988beda4177db727eccf192b5e4660
parent 030f548d006b8f2d819d7a62cc8ebd8fe08c6483

Revert "Remove platform availability from internal libs that make up"

This reverts commit 030f548d006b8f2d819d7a62cc8ebd8fe08c6483.

Reason for revert: Droidcop: Potential culprit for b/154165728 - verifying through Forrest before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Change-Id: Id1faeba61ff1ba667fc36d14547d8d99a392ba73

libartbase/Android.bp

diff --git a/libartbase/Android.bp b/libartbase/Android.bp
index 8e33752..c110315 100644
--- a/libartbase/Android.bp
+++ b/libartbase/Android.bp
@@ -176,6 +176,9 @@
     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 b4b2e0b..63abfe2 100644
--- a/libartpalette/Android.bp
+++ b/libartpalette/Android.bp
@@ -92,6 +92,9 @@
         "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 664fc1b..d9e1ada 100644
--- a/libdexfile/Android.bp
+++ b/libdexfile/Android.bp
@@ -178,6 +178,9 @@
     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",
     ],
 }
 
@@ -314,6 +317,9 @@
     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",
     ],
 }