diff options
| -rw-r--r-- | core/product.mk | 3 | ||||
| -rw-r--r-- | core/product_config.mk | 16 | ||||
| -rw-r--r-- | target/product/embedded.mk | 5 | ||||
| -rw-r--r-- | target/product/full_base.mk | 3 | ||||
| -rw-r--r-- | target/product/security/Android.mk | 13 |
5 files changed, 31 insertions, 9 deletions
diff --git a/core/product.mk b/core/product.mk index 4682dac992..102d17f2d8 100644 --- a/core/product.mk +++ b/core/product.mk @@ -141,8 +141,7 @@ _product_var_list := \ PRODUCT_ART_USE_READ_BARRIER \ PRODUCT_IOT \ PRODUCT_SYSTEM_HEADROOM \ - PRODUCT_MINIMIZE_JAVA_DEBUG_INFO \ - PRODUCT_INTEGER_OVERFLOW_EXCLUDE_PATHS \ + PRODUCT_ADB_KEYS \ diff --git a/core/product_config.mk b/core/product_config.mk index f7ae834fbc..7707a5d307 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -449,10 +449,12 @@ PRODUCT_ENFORCE_RRO_TARGETS := \ PRODUCT_SYSTEM_HEADROOM := \ $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SYSTEM_HEADROOM)) -# Whether to save disk space by minimizing java debug info -PRODUCT_MINIMIZE_JAVA_DEBUG_INFO := \ - $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_MINIMIZE_JAVA_DEBUG_INFO)) - -# Whether any paths are excluded from sanitization when SANITIZE_TARGET=integer_overflow -PRODUCT_INTEGER_OVERFLOW_EXCLUDE_PATHS := \ - $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_INTEGER_OVERFLOW_EXCLUDE_PATHS)) +# ADB keys for debuggable builds +PRODUCT_ADB_KEYS := +ifneq ($(filter eng userdebug,$(TARGET_BUILD_VARIANT)),) + PRODUCT_ADB_KEYS := $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).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 +.KATI_READONLY := PRODUCT_ADB_KEYS diff --git a/target/product/embedded.mk b/target/product/embedded.mk index 7efa686326..4d6bb8b923 100644 --- a/target/product/embedded.mk +++ b/target/product/embedded.mk @@ -109,6 +109,11 @@ PRODUCT_PACKAGES += \ fs_config_files \ fs_config_dirs +# If there are product-specific adb keys defined, install them on debuggable +# builds. +PRODUCT_PACKAGES_DEBUG += \ + adb_keys + # Ensure that this property is always defined so that bionic_systrace.cpp # can rely on it being initially set by init. PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ diff --git a/target/product/full_base.mk b/target/product/full_base.mk index 65bdf0f1b4..305f373148 100644 --- a/target/product/full_base.mk +++ b/target/product/full_base.mk @@ -56,3 +56,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/locales_full.mk) # Get everything else from the parent package $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_no_telephony.mk) + +# Add adb keys to debuggable AOSP builds (if they exist) +$(call inherit-product-if-exists, vendor/google/security/adb/vendor_key.mk) diff --git a/target/product/security/Android.mk b/target/product/security/Android.mk index 5a40397abf..4142ea9149 100644 --- a/target/product/security/Android.mk +++ b/target/product/security/Android.mk @@ -10,3 +10,16 @@ LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) include $(BUILD_PREBUILT) + +####################################### +# adb key, if configured via PRODUCT_ADB_KEYS +ifdef PRODUCT_ADB_KEYS + ifneq ($(filter eng userdebug,$(TARGET_BUILD_VARIANT)),) + include $(CLEAR_VARS) + LOCAL_MODULE := adb_keys + LOCAL_MODULE_CLASS := ETC + LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) + LOCAL_PREBUILT_MODULE_FILE := $(PRODUCT_ADB_KEYS) + include $(BUILD_PREBUILT) + endif +endif |