commit fcdeba0d6d662d555e8b73bd27aa85946424519f
author Neil Fuller <nfuller@google.com> Thu Nov 15 15:17:04 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 15 15:17:04 2018 +0000
tree 9e82170c39de9d25a726898a1d775b191293e521
parent 08d4227898f7fec853a9e4b1bdf453ac61f60aa8
parent 97d2d0c8b553e78583257dd386b3026c9d7fc1fd

Merge "Add the time zone data module to /system"

target/product/mainline_system.mk

diff --git a/target/product/mainline_system.mk b/target/product/mainline_system.mk
index 3a8bd11..862a341 100644
--- a/target/product/mainline_system.mk
+++ b/target/product/mainline_system.mk
@@ -56,6 +56,9 @@
     audio.a2dp.default \
     audio.hearing_aid.default \
 
+# For ringtones that rely on forward lock encryption
+PRODUCT_PACKAGES += libfwdlockengine
+
 PRODUCT_PACKAGES_DEBUG += \
     avbctl \
     bootctl \

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 += \