[automerger skipped] Merge "Use APK CtsShim prebuilts for flattened apex." into rvc-dev-plus-aosp am: f3c2823040 am: e93b598eb8 am: ae2159dbcf -s ours
am skip reason: Change-Id Icc52500cfc0a555e11d1a467b2da0649c7f5d31f with SHA-1 e23fd86f1b is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11789975
Change-Id: I8e2dbb0adc95339ab04074ee559c152bb6b36ea4
diff --git a/CleanSpec.mk b/CleanSpec.mk
index ef9461b..f98add3 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 2c67b49..d5f051a 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -51,6 +51,7 @@
charger \
cmd \
com.android.adbd \
+ com.android.appsearch \
com.android.conscrypt \
com.android.cronet \
com.android.extservices \
@@ -84,6 +85,7 @@
e2fsck \
ExtShared \
flags_health_check \
+ framework-graphics \
framework-minus-apex \
framework-res \
framework-sysconfig.xml \
@@ -207,6 +209,7 @@
media_profiles_V1_0.dtd \
MediaProviderLegacy \
mediaserver \
+ mediatranscoding \
mke2fs \
monkey \
mtpd \
@@ -323,6 +326,7 @@
PRODUCT_BOOT_JARS := \
$(ART_APEX_JARS) \
framework-minus-apex \
+ framework-graphics \
ext \
com.android.i18n:core-icu4j \
telephony-common \
@@ -330,6 +334,7 @@
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/cfi-common.mk b/target/product/cfi-common.mk
index 42edd92..6ddc081 100644
--- a/target/product/cfi-common.mk
+++ b/target/product/cfi-common.mk
@@ -32,7 +32,7 @@
system/bt \
system/chre \
system/core/libnetutils \
- system/core/libziparchive \
+ system/libziparchive \
system/gatekeeper \
system/keymaster \
system/nfc \
diff --git a/target/product/gsi/current.txt b/target/product/gsi/current.txt
index 0589517..4aafd58 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 26fb7f3..c034a82 100644
--- a/target/product/media_system.mk
+++ b/target/product/media_system.mk
@@ -57,8 +57,8 @@
# 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 \
PRODUCT_COPY_FILES += \