diff options
| author | Joseph Murphy <murj@google.com> | 2019-12-19 01:07:03 +0000 |
|---|---|---|
| committer | Joseph Murphy <murj@google.com> | 2019-12-19 01:07:03 +0000 |
| commit | 2af940b63b71a6aae0b4b8bdf531bc23cebad5bd (patch) | |
| tree | 9643b5cb49f79640bad74c128e078ed1b44e4e9f | |
| parent | 19b02461a94f8f381c5bf294568d49275d4cb1bb (diff) | |
| download | device_google_fuchsia-2af940b63b71a6aae0b4b8bdf531bc23cebad5bd.tar.gz device_google_fuchsia-2af940b63b71a6aae0b4b8bdf531bc23cebad5bd.tar.bz2 device_google_fuchsia-2af940b63b71a6aae0b4b8bdf531bc23cebad5bd.zip | |
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: Ic76735eac719c36f5fccca8c90feca8ee9ce7c4e
| -rw-r--r-- | fuchsia.mk | 27 |
1 files changed, 10 insertions, 17 deletions
@@ -27,26 +27,19 @@ PRODUCT_BUILD_RAMDISK_IMAGE := false # default is nosdcard, S/W button enabled in resource PRODUCT_CHARACTERISTICS := nosdcard -art_apex := com.android.art.release -ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) - art_apex := com.android.art.debug -endif - # Hand-picked packages. PRODUCT_PACKAGES += \ art-runtime \ - bouncycastle.$(art_apex) \ - conscrypt.com.android.conscrypt \ - core-icu4j.$(art_apex) \ - core-libart.$(art_apex) \ - core-oj.$(art_apex) \ - dalvikvm.$(art_apex) \ - libart.$(art_apex) \ - libjavacore.$(art_apex) \ - libopenjdk.$(art_apex) \ - okhttp.$(art_apex) - -art_apex := + bouncycastle \ + conscrypt \ + core-icu4j \ + core-libart \ + core-oj \ + dalvikvm \ + libart \ + libjavacore \ + libopenjdk \ + okhttp # Fuchsia only has 64-bit support. TARGET_SUPPORTS_32_BIT_APPS := false |