Merge "Use inclusive language in build/make part 2" am: e1ab4cb610 am: 09ee73f2a7 am: 0bd0e1bb69 am: b7d72f1cd5 am: fe39c5f99d
Original change: https://android-review.googlesource.com/c/platform/build/+/1344806
Change-Id: Ife3991d77d7121f36f74b6510ca881e7af8aee96
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 67aca7c..9d80ab9 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -744,7 +744,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 3187274..35cc189 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -50,6 +50,7 @@
charger \
cmd \
com.android.adbd \
+ com.android.appsearch \
com.android.conscrypt \
com.android.cronet \
com.android.extservices \
@@ -83,6 +84,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..a42f392 100644
--- a/target/product/gsi/current.txt
+++ b/target/product/gsi/current.txt
@@ -86,8 +86,10 @@
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.biometrics.fingerprint@2.3.so
VNDK-core: android.hardware.bluetooth.a2dp@1.0.so
VNDK-core: android.hardware.bluetooth.audio@2.0.so
VNDK-core: android.hardware.bluetooth@1.0.so
@@ -137,6 +139,7 @@
VNDK-core: android.hardware.gnss@1.1.so
VNDK-core: android.hardware.gnss@2.0.so
VNDK-core: android.hardware.gnss@2.1.so
+VNDK-core: android.hardware.gnss@3.0.so
VNDK-core: android.hardware.graphics.allocator@2.0.so
VNDK-core: android.hardware.graphics.allocator@3.0.so
VNDK-core: android.hardware.graphics.allocator@4.0.so
@@ -245,7 +248,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 d06d353..3e5ab16 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 += \