diff options
| author | Jiyong Park <jiyong@google.com> | 2019-12-03 13:11:20 +0900 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2019-12-17 10:11:26 +0900 |
| commit | 19b02461a94f8f381c5bf294568d49275d4cb1bb (patch) | |
| tree | 12e7d3eb7d7875215907b9df5aed3d9d98b7a130 | |
| parent | eba611b974ea52ff1bcff9065da08dcbaf4ffc9e (diff) | |
| download | fuchsia-19b02461a94f8f381c5bf294568d49275d4cb1bb.tar.gz | |
Rename modules that are APEX-only
The renamed modules are only available for APEXes, but not for the
platform. Use the <module_name>.<apex_name> syntax to correctly install
the APEX variant of the modules.
Bug: 128708192
Bug: 133140750
Test: m
Change-Id: I322b1efccb681ef22f95e2a1de90b7607aad9d30
| -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 |