commit aa407a85b7a1d07ed38664b4f400efd5bb63e727
author vichang <vichang@google.com> Thu Aug 08 11:06:53 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 08 11:06:53 2019 +0000
tree 394bd6cdacdcede88057e763e718c75d87647b51
parent 69340f6885a41d347b3c55b5c12d2a746346cdf0
parent 46d95f752b14aa00527568f56d47b9a4dc72a58d

Merge "Add com.android.i18n APEX module to PRODUCT_PACKAGES"

target/product/base_system.mk

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index c256641..60646c3 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -54,6 +54,7 @@
     charger \
     cmd \
     com.android.conscrypt \
+    com.android.i18n \
     com.android.location.provider \
     com.android.resolv \
     com.android.neuralnetworks \
@@ -289,7 +290,7 @@
     e2fsck \
     fastboot \
     flags_health_check \
-    icu-data_host_runtime_apex \
+    icu-data_host_i18n_apex \
     icu_tzdata.dat_host_tzdata_apex \
     incident_report \
     ld.mc \

target/product/base_vendor.mk

diff --git a/target/product/base_vendor.mk b/target/product/base_vendor.mk
index 4233c1c..c57cc3f 100644
--- a/target/product/base_vendor.mk
+++ b/target/product/base_vendor.mk
@@ -36,7 +36,7 @@
     make_f2fs \
 
 PRODUCT_HOST_PACKAGES += \
-    icu-data_host_runtime_apex
+    icu-data_host_i18n_apex
 
 # Base modules and settings for the vendor partition.
 PRODUCT_PACKAGES += \