diff options
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-19 02:00:30 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-19 02:00:30 +0000 |
commit | 1ab92d0cac25eb4f12fa989dd7fd44ce794856be (patch) | |
tree | 9643b5cb49f79640bad74c128e078ed1b44e4e9f | |
parent | 2d1662e817aaef3cd0cc16a09773b4befded41bd (diff) | |
parent | 8621aab5ec2cd70b59e1845a4373577a58305ec8 (diff) | |
download | device_google_fuchsia-1ab92d0cac25eb4f12fa989dd7fd44ce794856be.tar.gz device_google_fuchsia-1ab92d0cac25eb4f12fa989dd7fd44ce794856be.tar.bz2 device_google_fuchsia-1ab92d0cac25eb4f12fa989dd7fd44ce794856be.zip |
Revert submission 1191937-art_apex_available am: 2af940b63b am: 111df5aa0a am: 8621aab5ec
Change-Id: Ibd47624214fdf91a3555b5f0d991db163c424074
-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 |