Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3181bdd2 authored by Kornel Dulęba's avatar Kornel Dulęba Committed by Gerrit Code Review
Browse files

Merge "Support ADB product keys purging with a dedicated flag" into main

parents 093e0a8a fe3a08df
Loading
Loading
Loading
Loading
+9 −2
Original line number Diff line number Diff line
@@ -468,10 +468,17 @@ $(foreach c,$(PRODUCT_SANITIZER_MODULE_CONFIGS),\
    $(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