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

Commit ae5a816b authored Aug 30, 2024 by Inseob Kim Committed by Automerger Merge Worker Aug 30, 2024

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

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

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

parents 0b78a4cf 1a3f842d

target/product/base_product.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -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

+0 −1

Original line number	Diff line number	Diff line
		@@ -465,7 +465,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

+1 −1

Original line number	Diff line number	Diff line
		@@ -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