commit c47f2beef3433b386dad7d9c3925e3dca73ed443
author Roland Levillain <rpl@google.com> Wed Nov 14 14:22:08 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 14 14:22:08 2018 +0000
tree d74d3fe696e19e701e751c274bf0c7e4d0dd3c23
parent 8ee39f031c7e035bd1b3295ee6aca1b639cca8c7
parent 53ccc721794620537a879345ec65879e63dec2c9

Merge "Revert^2 "Add the Android Runtime APEX module to PRODUCT_PACKAGES.""

target/product/runtime_libart.mk

diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk
index bda4524..6d835fd 100644
--- a/target/product/runtime_libart.mk
+++ b/target/product/runtime_libart.mk
@@ -51,6 +51,10 @@
 PRODUCT_PACKAGES += art-runtime
 # ART/dex helpers.
 PRODUCT_PACKAGES += art-tools
+# Android Runtime APEX module.
+ifneq ($(DONT_INCLUDE_RUNTIME_APEX), true)
+  PRODUCT_PACKAGES += com.android.runtime
+endif
 
 # Certificates.
 PRODUCT_PACKAGES += \