diff options
| author | Jiyong Park <jiyong@google.com> | 2019-12-02 13:47:03 +0900 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2019-12-16 14:11:47 +0900 |
| commit | 893487dcf22e1630cc1c5d94ce1eb6876a3ab3b2 (patch) | |
| tree | 09de47b8f39a04207d7c1a54567dffd3611d50de | |
| parent | 76033cbc1b377a13fb2ccf5f2f8ea94847924ab1 (diff) | |
Use apex_available property
Use apex_available property to prevent modules that are only for the ART
apex from being used outside of the APEX.
Bug: 128708192
Bug: 133140750
Test: m
Change-Id: I190ce2d10bd1626b420227a726072c5ac4d85d94
| -rw-r--r-- | JavaLibrary.bp | 8 | ||||
| -rw-r--r-- | NativeCode.bp | 15 |
2 files changed, 23 insertions, 0 deletions
diff --git a/JavaLibrary.bp b/JavaLibrary.bp index 41a7af99a2..c239fe76fd 100644 --- a/JavaLibrary.bp +++ b/JavaLibrary.bp @@ -261,6 +261,10 @@ java_library { "//external/wycheproof", "//libcore/benchmarks", ], + apex_available: [ + "com.android.art.release", + "com.android.art.debug", + ], defaults: ["libcore_java_defaults"], installable: true, hostdex: true, @@ -305,6 +309,10 @@ java_library { "//libcore/benchmarks", "//frameworks/layoutlib", ], + apex_available: [ + "com.android.art.release", + "com.android.art.debug", + ], defaults: ["libcore_java_defaults"], installable: true, hostdex: true, diff --git a/NativeCode.bp b/NativeCode.bp index a27fa74821..7bacc1528a 100644 --- a/NativeCode.bp +++ b/NativeCode.bp @@ -50,6 +50,10 @@ cc_library_shared { visibility: [ "//art/build/apex", ], + apex_available: [ + "com.android.art.release", + "com.android.art.debug", + ], defaults: [ "core_native_default_flags", "core_native_default_libs", @@ -89,6 +93,10 @@ cc_library_shared { visibility: [ "//art/build/apex", ], + apex_available: [ + "com.android.art.release", + "com.android.art.debug", + ], defaults: [ "core_native_default_flags", ], @@ -164,6 +172,10 @@ cc_library_shared { visibility: [ "//art/build/apex", ], + apex_available: [ + "com.android.art.release", + "com.android.art.debug", + ], defaults: ["libopenjdk_native_defaults"], shared_libs: [ "libopenjdkjvm", @@ -176,6 +188,9 @@ cc_library_shared { visibility: [ "//art/build/apex", ], + apex_available: [ + "com.android.art.debug", + ], defaults: ["libopenjdk_native_defaults"], shared_libs: [ "libopenjdkjvmd", |