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

Commit 1a3f842d authored by Inseob Kim's avatar Inseob Kim Committed by Gerrit Code Review
Browse files

Merge "Move adb_keys to product partition" into main

parents 4713911b ff517c61

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