StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move adb_keys to product partition

Browse Source 
/adb_keys will be moved to /product/etc/security as it's a
product-specific file. To prevent regression, /adb_keys will be a
symlink to the new location.

Bug: 353430323
Test: boot and connect adb with ADB_VENDOR_KEYS
Change-Id: Ieee2974925df4b3797483c96b78a0d2a2aa9a57d
This commit is contained in:
Inseob Kim
2024-08-27 17:48:46 +09:00
parent 1b8b8d23c4
commit ff517c6151
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
target/product/base_product.mk
View File

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

1
target/product/base_system.mk
View File

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

2
target/product/security/Android.mk
View File

@@ -10,7 +10,7 @@ ifdef PRODUCT_ADB_KEYS
LOCAL_LICENSE_CONDITIONS := notice LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
LOCAL_MODULE_CLASS := ETC 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) LOCAL_PREBUILT_MODULE_FILE := $(PRODUCT_ADB_KEYS)
include $(BUILD_PREBUILT) include $(BUILD_PREBUILT)
endif endif