Merge "Fix make conditional" am: 3e315b9afc
am: b5560e2fc4
Original change: https://android-review.googlesource.com/c/platform/build/+/1931200 Change-Id: I41dcc99125aa10d800c9df8cf83f308b085747d4
This commit is contained in:
@@ -412,7 +412,7 @@ $(foreach c,$(PRODUCT_SANITIZER_MODULE_CONFIGS),\
|
|||||||
_psmc_modules :=
|
_psmc_modules :=
|
||||||
|
|
||||||
# Reset ADB keys for non-debuggable builds
|
# Reset ADB keys for non-debuggable builds
|
||||||
ifeq (,$(filter eng userdebug,$(TARGET_BUILD_VARIANT)),)
|
ifeq (,$(filter eng userdebug,$(TARGET_BUILD_VARIANT)))
|
||||||
PRODUCT_ADB_KEYS :=
|
PRODUCT_ADB_KEYS :=
|
||||||
endif
|
endif
|
||||||
ifneq ($(filter-out 0 1,$(words $(PRODUCT_ADB_KEYS))),)
|
ifneq ($(filter-out 0 1,$(words $(PRODUCT_ADB_KEYS))),)
|
||||||
|
Reference in New Issue
Block a user