Merge "Move adb_keys to product partition" into main am: 1a3f842d48 am: ae5a816be5

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

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

target/product/base_product.mk

@@ -26,3 +26,7 @@ PRODUCT_PACKAGES += \
     product_manifest.xml \
     selinux_policy_product \
     product-build.prop \
+
+# Packages included only for eng or userdebug builds, previously debug tagged
+PRODUCT_PACKAGES_DEBUG += \
+    adb_keys \

target/product/base_system.mk

@@ -467,7 +467,6 @@ PRODUCT_PACKAGES += \
 
 # Packages included only for eng or userdebug builds, previously debug tagged
 PRODUCT_PACKAGES_DEBUG := \
-    adb_keys \
     adevice_fingerprint \
     arping \
     dmuserd \

target/product/security/Android.mk

@@ -10,7 +10,7 @@ ifdef PRODUCT_ADB_KEYS
     LOCAL_LICENSE_CONDITIONS := notice
     LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
     LOCAL_MODULE_CLASS := ETC
-    LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
+    LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT_ETC)/security
     LOCAL_PREBUILT_MODULE_FILE := $(PRODUCT_ADB_KEYS)
     include $(BUILD_PREBUILT)
   endif