[automerger skipped] strings.mk: Allow empty RHS values for inputs of collapse-pairs am: cc39735e55 am: c461e817e4 am: 5f8fd89cf1 am: aec22adf04 -s ours am: 4b31445bda -s ours
am skip reason: Change-Id I35faeaedc3bc42e56e01201baf7ea6805a610439 with SHA-1 cc39735e55 is in history
Change-Id: Id7782d3532273ea3a94bba317e38c6aa3bf75b4e
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 623dc39..85a5c69 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -741,7 +741,7 @@
$(call add-clean-step, rm -rf $(HOST_OUT)/framework/vts-core-tradefed.jar)
$(call add-clean-step, rm -rf $(HOST_OUT)/vts10/*)
$(call add-clean-step, rm -rf $(HOST_OUT)/framework/vts10-tradefed.jar)
-# Clean up VTS again as VTS-Core will be renamed to VTS
+# Clean up VTS again as VTS-Core will be renamed to VTS
$(call add-clean-step, rm -rf $(HOST_OUT)/vts/*)
$(call add-clean-step, rm -rf $(HOST_OUT)/framework/vts-tradefed.jar)
diff --git a/core/build_id.mk b/core/build_id.mk
index 11f4a80..2f9c3f3 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
# (like "CRB01"). It must be a single word, and is
# capitalized by convention.
-BUILD_ID=RVC
+BUILD_ID=MASTER
diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 6a96d21..0e77a35 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -51,7 +51,9 @@
cmd \
com.android.adbd \
com.android.apex.cts.shim.v1 \
+ com.android.appsearch \
com.android.conscrypt \
+ com.android.cronet \
com.android.extservices \
com.android.i18n \
com.android.ipsec \
@@ -81,6 +83,7 @@
e2fsck \
ExtShared \
flags_health_check \
+ framework-graphics \
framework-minus-apex \
framework-res \
framework-sysconfig.xml \
@@ -319,12 +322,14 @@
PRODUCT_BOOT_JARS := \
$(ART_APEX_JARS) \
framework-minus-apex \
+ framework-graphics \
ext \
telephony-common \
voip-common \
ims-common
PRODUCT_UPDATABLE_BOOT_JARS := \
+ com.android.appsearch:framework-appsearch \
com.android.conscrypt:conscrypt \
com.android.media:updatable-media \
com.android.mediaprovider:framework-mediaprovider \
diff --git a/target/product/gsi/current.txt b/target/product/gsi/current.txt
index cc2d36d..393d545 100644
--- a/target/product/gsi/current.txt
+++ b/target/product/gsi/current.txt
@@ -86,6 +86,7 @@
VNDK-core: android.hardware.automotive.sv@1.0.so
VNDK-core: android.hardware.automotive.vehicle@2.0.so
VNDK-core: android.hardware.biometrics.face@1.0.so
+VNDK-core: android.hardware.biometrics.face@1.1.so
VNDK-core: android.hardware.biometrics.fingerprint@2.1.so
VNDK-core: android.hardware.biometrics.fingerprint@2.2.so
VNDK-core: android.hardware.bluetooth.a2dp@1.0.so
@@ -245,7 +246,6 @@
VNDK-core: android.system.net.netd@1.1.so
VNDK-core: android.system.suspend@1.0.so
VNDK-core: android.system.wifi.keystore@1.0.so
-VNDK-core: libadf.so
VNDK-core: libaudioroute.so
VNDK-core: libaudioutils.so
VNDK-core: libbinder.so
diff --git a/target/product/media_system.mk b/target/product/media_system.mk
index 5ff747f..dab884c 100644
--- a/target/product/media_system.mk
+++ b/target/product/media_system.mk
@@ -59,6 +59,7 @@
# system server jars which are updated via apex modules.
# The values should be of the format <apex name>:<jar name>
PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS := \
+ com.android.appsearch:service-appsearch \
com.android.permission:service-permission \
com.android.wifi:service-wifi \
com.android.ipsec:android.net.ipsec.ike \