diff options
| author | Jiyong Park <jiyong@google.com> | 2019-12-18 16:25:15 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-12-18 16:25:15 -0800 |
| commit | 5e7f2ff7a7f9c8049c8fc72e23a65ea57637ea1f (patch) | |
| tree | 12e7d3eb7d7875215907b9df5aed3d9d98b7a130 | |
| parent | eba611b974ea52ff1bcff9065da08dcbaf4ffc9e (diff) | |
| parent | 19b02461a94f8f381c5bf294568d49275d4cb1bb (diff) | |
| download | device_google_fuchsia-5e7f2ff7a7f9c8049c8fc72e23a65ea57637ea1f.tar.gz device_google_fuchsia-5e7f2ff7a7f9c8049c8fc72e23a65ea57637ea1f.tar.bz2 device_google_fuchsia-5e7f2ff7a7f9c8049c8fc72e23a65ea57637ea1f.zip | |
Rename modules that are APEX-only
am: 19b02461a9
Change-Id: I809b221a8d799cf1f287c7c1b0ae37c0dfade6c7
| -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 |