commit 9d1cf4fe0401c6f9e8f1fb7a3e6546a20ccf827a
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 19 01:47:10 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 19 01:47:10 2020 +0000
tree 0d51490a6db8fe5c524a1e946570ac70a0ab2a84
parent da5cdbbad078750c9e83b154551b3f5fb4b95102
parent 2ec3be75ab30e2e02dbdf7d94730bea237d867f2

Merge "Allow apexes to link against more libs" am: 6c364f94ad am: 73b4968059

Change-Id: Ib677c8a314a668dd7f21849b687f133982a10f5c

base/Android.bp

diff --git a/base/Android.bp b/base/Android.bp
index a32959b..25c74f2 100644
--- a/base/Android.bp
+++ b/base/Android.bp
@@ -128,6 +128,10 @@
     static_libs: ["fmtlib"],
     whole_static_libs: ["fmtlib"],
     export_static_lib_headers: ["fmtlib"],
+    apex_available: [
+        "//apex_available:anyapex",
+        "//apex_available:platform",
+    ],
 }
 
 cc_library_static {

libsysutils/Android.bp

diff --git a/libsysutils/Android.bp b/libsysutils/Android.bp
index ccda5d1..627f0d4 100644
--- a/libsysutils/Android.bp
+++ b/libsysutils/Android.bp
@@ -39,6 +39,10 @@
         "clang-analyzer-security*",
         "android-*",
     ],
+    apex_available: [
+        "//apex_available:anyapex",
+        "//apex_available:platform",
+    ],
 }
 
 cc_test {