commit ec0fccfbf989fdbc1a8205a7dc46336a8c960fdc
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Oct 07 22:08:50 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 07 22:08:50 2024 +0000
tree 864c4fb0ce047ee7fe6abf8eb83ffd00677a2397
parent fec5d01ba517595edda6eda3b56686f2e263dca3
parent efaeb5e58b88346e5b128d8ccae6bfb9d6fa1e40

Merge "Adding EXTRA_ALLOWED_DEPS_TXT config for non-mainline deps" into main

target/product/base_system.mk

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 563511f..74ed82d 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -504,6 +504,10 @@
     unwind_reg_info \
     unwind_symbols \
 
+# For Remotely Provisioned Certificate Processor
+PRODUCT_SYSTEM_PROPERTIES += \
+    remote_provisioning.use_cert_processor=false
+
 # The set of packages whose code can be loaded by the system server.
 PRODUCT_SYSTEM_SERVER_APPS += \
     SettingsProvider \

tools/filelistdiff/allowlist_next

diff --git a/tools/filelistdiff/allowlist_next b/tools/filelistdiff/allowlist_next
index d7078f5..8f91c9f 100644
--- a/tools/filelistdiff/allowlist_next
+++ b/tools/filelistdiff/allowlist_next
@@ -7,9 +7,3 @@
 framework/oat/x86_64/apex@com.android.compos@javalib@service-compos.jar@classes.odex.fsv_meta
 framework/oat/x86_64/apex@com.android.compos@javalib@service-compos.jar@classes.vdex
 framework/oat/x86_64/apex@com.android.compos@javalib@service-compos.jar@classes.vdex.fsv_meta
-
-# Soong only installed files
-etc/aconfig/flag.info
-etc/aconfig/flag.map
-etc/aconfig/flag.val
-etc/aconfig/package.map