commit c10e45e65d1dbddb9e51d8a242364708643d065e
author Kornel Dulęba <korneld@google.com> Fri Dec 06 18:17:15 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Dec 06 18:17:15 2024 +0000
tree 5ad8eef8abfcc5ea0297ba48ff23431e674af992
parent bf19afe3b35c9c35a83df236b4f7abcd3ee488f3
parent 3181bdd2c323dee5979d5b2f6f85f8558f834dce

Merge "Support ADB product keys purging with a dedicated flag" into main am: 3181bdd2c3

Original change: https://android-review.googlesource.com/c/platform/build/+/3369193

Change-Id: I9fc7f9f799f2409a0f335e624782fd7d7fa91174
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/product_config.mk

diff --git a/core/product_config.mk b/core/product_config.mk
index 68614ae..f93b63c 100644
--- a/core/product_config.mk
+++ b/core/product_config.mk
@@ -468,10 +468,17 @@
     $(eval SANITIZER.$(TARGET_PRODUCT).$(m).CONFIG := $(cf))))
 _psmc_modules :=
 
-# Reset ADB keys for non-debuggable builds
-ifeq (,$(filter eng userdebug,$(TARGET_BUILD_VARIANT)))
+# Reset ADB keys. If RELEASE_BUILD_USE_VARIANT_FLAGS is set look for
+# the value of a dedicated flag. Otherwise check if build variant is
+# non-debuggable.
+ifneq (,$(RELEASE_BUILD_USE_VARIANT_FLAGS))
+ifneq (,$(RELEASE_BUILD_PURGE_PRODUCT_ADB_KEYS))
   PRODUCT_ADB_KEYS :=
 endif
+else ifeq (,$(filter eng userdebug,$(TARGET_BUILD_VARIANT)))
+  PRODUCT_ADB_KEYS :=
+endif
+
 ifneq ($(filter-out 0 1,$(words $(PRODUCT_ADB_KEYS))),)
   $(error Only one file may be in PRODUCT_ADB_KEYS: $(PRODUCT_ADB_KEYS))
 endif