commit 7667131af4d4516269acebce42249055518d2374
author Jiyong Park <jiyong@google.com> Wed Jan 15 15:49:01 2020 +0900
committer Jiyong Park <jiyong@google.com> Fri Jan 17 10:31:56 2020 +0900
tree 787e40ddd161444fac00aebb62ec093f1c943a0f
parent ab1c6c4c7a7dd103bf58288bf3f50652985fdc32

apex_available becomes more correct

Previously, Soong didn't follow the static dependencies when checking
apex_available. As a result, a module that is not available to an APEX
(or to the platform) was able to be statically linked from the APEX (or
the platform).

As the Soong bug is fixed, unchecked dependencies have revealed and this
change reflects the finding.

Bug: 147671264
Test: m
Change-Id: I7927760f78c7eea49d9354bfa822ad369ef8600e

NativeCode.bp

diff --git a/NativeCode.bp b/NativeCode.bp
index 25c128b..bdf1507 100644
--- a/NativeCode.bp
+++ b/NativeCode.bp
@@ -97,6 +97,10 @@
     apex_available: [
         "com.android.art.release",
         "com.android.art.debug",
+        // TODO(b/147813447) remove this. This is currently due to the 'runtime_libs'
+        // dependency from libjavacrypto in the conscrypt APEX.
+        "com.android.conscrypt",
+        "test_com.android.conscrypt",
     ],
     defaults: [
         "core_native_default_flags",