diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-19 00:42:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-19 00:42:02 +0000 |
| commit | 4f4dee1aefbccac3c9d3156dd7c9172d94f5dca3 (patch) | |
| tree | 12e7d3eb7d7875215907b9df5aed3d9d98b7a130 | |
| parent | 33083ceecf1e5124aa3ade945e8b71e758985912 (diff) | |
| parent | 5e7f2ff7a7f9c8049c8fc72e23a65ea57637ea1f (diff) | |
| download | fuchsia-4f4dee1aefbccac3c9d3156dd7c9172d94f5dca3.tar.gz | |
Rename modules that are APEX-only am: 19b02461a9 am: 5e7f2ff7a7
Change-Id: Iff9f90afcd82dbc48ad461643d8e29c9ed96db47
| -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 |