diff options
author | Joseph Murphy <murj@google.com> | 2019-12-19 01:07:00 +0000 |
---|---|---|
committer | Joseph Murphy <murj@google.com> | 2019-12-19 01:07:00 +0000 |
commit | 2a6cbb55074e7e6e2103154d654cf6e486fb21b4 (patch) | |
tree | 741a07aa38566409f0d35f135927c6977f64ca9c /NativeCode.bp | |
parent | 893487dcf22e1630cc1c5d94ce1eb6876a3ab3b2 (diff) |
Revert submission 1191937-art_apex_available
Original Commit Message:
"""
Rename modules that are APEX-only
The renamed modules are only available for APEXes, but not for the
platform. Use the <module_name>.<apex_name> syntax to correctly install
the APEX variant of the modules.
"""
Reason for revert: Build Cop - Breaks about 15 AOSP targets, with high confidence due to these changes being the only non-robot changes in those builds.
Reverted Changes:
I190ce2d10:Use apex_available property
I990e0a67e:Use apex_available property
I0d1295683:Revert "Avoid duplicated classes for boot dex jars...
I5fb725403:Find the jar libraries in APEX from the correct pa...
I322b1efcc:Rename modules that are APEX-only
Ifa2bd0f8f:Use apex_available property
Iac6533177:Use apex_available property
Ie999602c6:Use apex_available property
I2a3d73397:Use apex_available property
Ic91bcbb9a:Use apex_available property
Ia6c324eed:Use apex_available property
I964d0125c:Use apex_available property
Change-Id: Ic4119368c4166ef878c9eb4a5bf14b66bf73dc54
Diffstat (limited to 'NativeCode.bp')
-rw-r--r-- | NativeCode.bp | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/NativeCode.bp b/NativeCode.bp index 7bacc1528a..a27fa74821 100644 --- a/NativeCode.bp +++ b/NativeCode.bp @@ -50,10 +50,6 @@ 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", @@ -93,10 +89,6 @@ cc_library_shared { visibility: [ "//art/build/apex", ], - apex_available: [ - "com.android.art.release", - "com.android.art.debug", - ], defaults: [ "core_native_default_flags", ], @@ -172,10 +164,6 @@ cc_library_shared { visibility: [ "//art/build/apex", ], - apex_available: [ - "com.android.art.release", - "com.android.art.debug", - ], defaults: ["libopenjdk_native_defaults"], shared_libs: [ "libopenjdkjvm", @@ -188,9 +176,6 @@ cc_library_shared { visibility: [ "//art/build/apex", ], - apex_available: [ - "com.android.art.debug", - ], defaults: ["libopenjdk_native_defaults"], shared_libs: [ "libopenjdkjvmd", |