Merge "Fix make conditional" am: 3e315b9afc am: b5560e2fc4 am: f2bf87a8ff

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

Change-Id: Ic8317970e60153b6b92747e8fb12b658bd0e8150
This commit is contained in:
Treehugger Robot 2021-12-22 18:33:36 +00:00 committed by Automerger Merge Worker
commit eabf1e38fa

View file

@ -412,7 +412,7 @@ $(foreach c,$(PRODUCT_SANITIZER_MODULE_CONFIGS),\
_psmc_modules :=
# Reset ADB keys for non-debuggable builds
ifeq (,$(filter eng userdebug,$(TARGET_BUILD_VARIANT)),)
ifeq (,$(filter eng userdebug,$(TARGET_BUILD_VARIANT)))
PRODUCT_ADB_KEYS :=
endif
ifneq ($(filter-out 0 1,$(words $(PRODUCT_ADB_KEYS))),)