diff options
| -rw-r--r-- | CleanSpec.mk | 2 | ||||
| -rw-r--r-- | core/build_id.mk | 2 | ||||
| -rw-r--r-- | core/line_coverage.mk | 1 | ||||
| -rw-r--r-- | target/product/base_system.mk | 5 | ||||
| -rw-r--r-- | target/product/cfi-common.mk | 2 | ||||
| -rw-r--r-- | target/product/gsi/current.txt | 2 | ||||
| -rw-r--r-- | target/product/media_system.mk | 2 |
7 files changed, 10 insertions, 6 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 67aca7c81a..9d80ab9638 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -744,7 +744,7 @@ $(call add-clean-step, rm -rf $(HOST_OUT)/vts-core/*) $(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 11f4a80669..2f9c3f3bf1 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/core/line_coverage.mk b/core/line_coverage.mk index b920e285d4..09c36da653 100644 --- a/core/line_coverage.mk +++ b/core/line_coverage.mk @@ -47,7 +47,6 @@ critical_components_shared := \ libinputflinger \ libopus \ libstagefright \ - libunwind \ libvixl:com.android.art.debug # Use the intermediates directory to avoid installing libraries to the device. diff --git a/target/product/base_system.mk b/target/product/base_system.mk index 3187274f5f..35cc189968 100644 --- a/target/product/base_system.mk +++ b/target/product/base_system.mk @@ -50,6 +50,7 @@ PRODUCT_PACKAGES += \ charger \ cmd \ com.android.adbd \ + com.android.appsearch \ com.android.conscrypt \ com.android.cronet \ com.android.extservices \ @@ -83,6 +84,7 @@ PRODUCT_PACKAGES += \ e2fsck \ ExtShared \ flags_health_check \ + framework-graphics \ framework-minus-apex \ framework-res \ framework-sysconfig.xml \ @@ -207,6 +209,7 @@ PRODUCT_PACKAGES += \ media_profiles_V1_0.dtd \ MediaProviderLegacy \ mediaserver \ + mediatranscoding \ mke2fs \ monkey \ mtpd \ @@ -323,6 +326,7 @@ endif PRODUCT_BOOT_JARS := \ $(ART_APEX_JARS) \ framework-minus-apex \ + framework-graphics \ ext \ com.android.i18n:core-icu4j \ telephony-common \ @@ -330,6 +334,7 @@ PRODUCT_BOOT_JARS := \ 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 42edd9246a..6ddc081b62 100644 --- a/target/product/cfi-common.mk +++ b/target/product/cfi-common.mk @@ -32,7 +32,7 @@ PRODUCT_CFI_INCLUDE_PATHS := \ 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 0589517711..4aafd58344 100644 --- a/target/product/gsi/current.txt +++ b/target/product/gsi/current.txt @@ -86,6 +86,7 @@ VNDK-core: android.hardware.automotive.occupant_awareness-V1-ndk_platform.so 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.0.so 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 d06d353334..3e5ab1629b 100644 --- a/target/product/media_system.mk +++ b/target/product/media_system.mk @@ -57,8 +57,8 @@ PRODUCT_SYSTEM_SERVER_JARS := \ # 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 += \ |