diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-20 01:42:57 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-20 01:42:57 +0000 |
| commit | bd27589b2b24d0975261e0b400c60b74bd18dfd4 (patch) | |
| tree | 12e7d3eb7d7875215907b9df5aed3d9d98b7a130 | |
| parent | 8621aab5ec2cd70b59e1845a4373577a58305ec8 (diff) | |
| parent | e7d138403781b7978fbf8a451009ac66ff27bf4a (diff) | |
| download | fuchsia-bd27589b2b24d0975261e0b400c60b74bd18dfd4.tar.gz | |
Revert submission 1194828-revert-1191937-art_apex_available-DWXQGTKMAR am: 955fb9863d am: e7d1384037android-r-preview-4android-r-preview-3android-r-preview-2
Change-Id: I9d98f9451d8b40f9271430a71d59d974d4367fe1
| -rw-r--r-- | fuchsia.mk | 27 |
1 files changed, 17 insertions, 10 deletions
@@ -27,19 +27,26 @@ 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 \ - conscrypt \ - core-icu4j \ - core-libart \ - core-oj \ - dalvikvm \ - libart \ - libjavacore \ - libopenjdk \ - okhttp + 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 := # Fuchsia only has 64-bit support. TARGET_SUPPORTS_32_BIT_APPS := false |