Revert submission 1194828-revert-1191937-art_apex_available-DWXQGTKMAR am: 955fb9863d am: e7d1384037 am: bd27589b2b
Change-Id: I5ff5727437505fa5264de057646acc6bad9d32be
diff --git a/fuchsia.mk b/fuchsia.mk
index 7009943..81338f0 100644
--- a/fuchsia.mk
+++ b/fuchsia.mk
@@ -27,19 +27,26 @@
# 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