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

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

Browse Source 
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>
This commit is contained in:
Inseob Kim
2024-08-30 01:21:25 +00:00
committed by Automerger Merge Worker
parent faee762e96 ae5a816be5
commit 23cedc764b
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

@@ -467,7 +467,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