diff options
| author | Jiyong Park <jiyong@google.com> | 2019-12-19 00:21:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-12-19 00:21:43 +0000 |
| commit | 5ff12cbc24f10517f789feae58992772f2a19e26 (patch) | |
| tree | da5c7c5db8929fc070477965ef50ea16257f51d9 | |
| parent | 517c939a7c00e1157c6c76bd963e15d9292c364f (diff) | |
| parent | 893487dcf22e1630cc1c5d94ce1eb6876a3ab3b2 (diff) | |
Merge "Use apex_available property"
| -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 ef2f554035..25c128b181 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", @@ -90,6 +94,10 @@ cc_library_shared { "//art/build/apex", "//external/conscrypt", ], + apex_available: [ + "com.android.art.release", + "com.android.art.debug", + ], defaults: [ "core_native_default_flags", ], @@ -165,6 +173,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", @@ -177,6 +189,9 @@ cc_library_shared { visibility: [ "//art/build/apex", ], + apex_available: [ + "com.android.art.debug", + ], defaults: ["libopenjdk_native_defaults"], shared_libs: [ "libopenjdkjvmd", |