diff options
| author | Jiyong Park <jiyong@google.com> | 2019-12-19 17:21:43 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-12-19 17:21:43 -0800 |
| commit | e7d138403781b7978fbf8a451009ac66ff27bf4a (patch) | |
| tree | 12e7d3eb7d7875215907b9df5aed3d9d98b7a130 | |
| parent | 111df5aa0a45c74a06596858487bbbb303e0b873 (diff) | |
| parent | 955fb9863dc388a2abc40ce1b0d9b5879f75c90d (diff) | |
| download | fuchsia-e7d138403781b7978fbf8a451009ac66ff27bf4a.tar.gz | |
Revert submission 1194828-revert-1191937-art_apex_available-DWXQGTKMAR
am: 955fb9863d
Change-Id: I778ea87de1672c4244a3b0af3ea769f65b2ee603
| -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 |