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

Commit 777e549a authored by Wei Li's avatar Wei Li Committed by Automerger Merge Worker
Browse files

Merge "Convert build/make/target/product/security/Android.mk to Android.bp"... 

Merge "Convert build/make/target/product/security/Android.mk to Android.bp" into main am: d76b3f31

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



Change-Id: I1f55be9d61fcbdc2f1218fca1f2d291f3208ecf9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d5539650 d76b3f31

core/soong_config.mk

+2 −0
Original line number Diff line number Diff line
@@ -364,6 +364,8 @@ $(call add_json_list, DeviceProductCompatibilityMatrixFile, $(DEVICE_PRODUCT_COM 
$(call add_json_list, BoardAvbSystemAddHashtreeFooterArgs, $(BOARD_AVB_SYSTEM_ADD_HASHTREE_FOOTER_ARGS))

$(call add_json_bool, BoardAvbEnable, $(filter true,$(BOARD_AVB_ENABLE)))



$(call add_json_str, AdbKeys, $(PRODUCT_ADB_KEYS))



$(call add_json_map, PartitionVarsForSoongMigrationOnlyDoNotUse)

  $(call add_json_str,  ProductDirectory,    $(dir $(INTERNAL_PRODUCT)))

target/product/security/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -37,3 +37,7 @@ otacerts_zip { 
    relative_install_path: "security",

    filename: "otacerts.zip",

}



adb_keys {

    name: "adb_keys",

}

target/product/security/Android.mk

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)



#######################################

# adb key, if configured via PRODUCT_ADB_KEYS

ifdef PRODUCT_ADB_KEYS

  ifneq ($(filter eng userdebug,$(TARGET_BUILD_VARIANT)),)

    include $(CLEAR_VARS)

    LOCAL_MODULE := adb_keys

    LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0

    LOCAL_LICENSE_CONDITIONS := notice

    LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE

    LOCAL_MODULE_CLASS := ETC

    LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT_ETC)/security

    LOCAL_PREBUILT_MODULE_FILE := $(PRODUCT_ADB_KEYS)

    include $(BUILD_PREBUILT)

  endif

endif