commit 111df5aa0a45c74a06596858487bbbb303e0b873
author Joseph Murphy <murj@google.com> Wed Dec 18 17:23:42 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Dec 18 17:23:42 2019 -0800
tree 9643b5cb49f79640bad74c128e078ed1b44e4e9f
parent 5e7f2ff7a7f9c8049c8fc72e23a65ea57637ea1f
parent 2af940b63b71a6aae0b4b8bdf531bc23cebad5bd

Revert submission 1191937-art_apex_available
am: 2af940b63b

Change-Id: I5bccad69a633ff5b520ae51a061f64f66c9262db

fuchsia.mk

diff --git a/fuchsia.mk b/fuchsia.mk
index 81338f0..7009943 100644
--- a/fuchsia.mk
+++ b/fuchsia.mk
@@ -27,26 +27,19 @@
 # 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.$(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 :=
+    bouncycastle \
+    conscrypt \
+    core-icu4j \
+    core-libart \
+    core-oj \
+    dalvikvm \
+    libart \
+    libjavacore \
+    libopenjdk \
+    okhttp
 
 # Fuchsia only has 64-bit support.
 TARGET_SUPPORTS_32_BIT_APPS := false