diff options
| -rw-r--r-- | core/soong_config.mk | 2 | ||||
| -rw-r--r-- | target/product/security/Android.bp | 4 | ||||
| -rw-r--r-- | target/product/security/Android.mk | 17 |
3 files changed, 6 insertions, 17 deletions
diff --git a/core/soong_config.mk b/core/soong_config.mk index 0421e19ae1..690828306c 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -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))) diff --git a/target/product/security/Android.bp b/target/product/security/Android.bp index 0d7b35e1c9..69d19a3e40 100644 --- a/target/product/security/Android.bp +++ b/target/product/security/Android.bp @@ -37,3 +37,7 @@ otacerts_zip { relative_install_path: "security", filename: "otacerts.zip", } + +adb_keys { + name: "adb_keys", +} diff --git a/target/product/security/Android.mk b/target/product/security/Android.mk deleted file mode 100644 index 138e5bbe31..0000000000 --- a/target/product/security/Android.mk +++ /dev/null @@ -1,17 +0,0 @@ -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 |