From 90418404d482c60ccf6c4c1c8861acd8a9843c7e Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Fri, 2 Nov 2018 14:36:08 +0900 Subject: [PATCH] Remove apex_debug_key Remove apex_debug_key, in favor of apex.test.key which is under /system/apex and is built with soong. Bug: 118213152 Test: /system/etc/security/apex/testkey exists Change-Id: Iaa0facea2d26cadd48783778e8915bc3c560de10 --- target/product/base_system.mk | 2 +- target/product/security/Android.mk | 13 ------ target/product/security/apex_debug_key | Bin 1032 -> 0 bytes target/product/security/apex_debug_key.pem | 51 --------------------- 4 files changed, 1 insertion(+), 65 deletions(-) delete mode 100644 target/product/security/apex_debug_key delete mode 100644 target/product/security/apex_debug_key.pem diff --git a/target/product/base_system.mk b/target/product/base_system.mk index 91071fde6..7b70c8655 100644 --- a/target/product/base_system.mk +++ b/target/product/base_system.mk @@ -309,7 +309,7 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += debug.atrace.tags.enableflags=0 # Packages included only for eng or userdebug builds, previously debug tagged PRODUCT_PACKAGES_DEBUG := \ adb_keys \ - apex_debug_key \ + apex.test.key \ iotop \ logpersist.start \ perfprofd \ diff --git a/target/product/security/Android.mk b/target/product/security/Android.mk index 73ebd75fb..4142ea914 100644 --- a/target/product/security/Android.mk +++ b/target/product/security/Android.mk @@ -11,19 +11,6 @@ LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) include $(BUILD_PREBUILT) -####################################### -# apex_debug_key for eng/userdebug -ifneq ($(filter eng userdebug,$(TARGET_BUILD_VARIANT)),) - include $(CLEAR_VARS) - - LOCAL_MODULE := apex_debug_key - LOCAL_SRC_FILES := $(LOCAL_MODULE) - LOCAL_MODULE_CLASS := ETC - LOCAL_MODULE_PATH := $(TARGET_OUT)/etc/security/apex - - include $(BUILD_PREBUILT) -endif - ####################################### # adb key, if configured via PRODUCT_ADB_KEYS ifdef PRODUCT_ADB_KEYS diff --git a/target/product/security/apex_debug_key b/target/product/security/apex_debug_key deleted file mode 100644 index 28bc8f71e29bd006aa9cb0598c4aa1420069a7a2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1032 zcmV+j1o!&@01yCD4Hb#Eh?0FVetT&l83*)jOw%(3g|Y^sLA($LcQ42pMD=&16?H8c z(}aXAiPE3F-$f`Fs3VOOYk*;X@UCK4S+}4@!QP>>=|v8@yVa83Evw$1{SI290FGo! zmL4`=vujXMQ%NS;Z6cq3(Zf6I%iVwKrz>Jj6o^5oCNvfp)s`}zyvGc~YgQE&XDIYH zCWL2NsJRG+u0qgUSrJMg3UYsqZX9DHr378^q{eu)!9_T~$UgTTTW%`^h1n(Pk5PX1 zJ}kDYBtrP9jS1p+^_%*0cL>-rtZR|3(XY?FR#}G%+%n9L@rycLIzqF0Yqno4LwKnO z$>@tYNVL+!`yUie#ihpJ>+zn4=+e9>Zlj?Tw>lR>?lvC9SBA1nL*KwvHI0~OJs>*x zJj+9g2RIbp3_6u9N2Pzy3fUHik=*g+^`7s!JWCz1)t?i5 zS2AU4Qifc9Xw6mHY}iA)AhBr0D8!J!g(UrkeL%0r39G&CT*NCI|?YD5vu4O<$(;JddbSVVF#%! zRXWFChA{>uZ`pczoiO#+0>=$4jP(ekMX&(_ScAboN2f%3+?2f)%`ne!pL3`;lNT~^ ziwkZz?JpvKUA*siV;-;l3x!V(sTF|HqC{=gF~MrMC9|*n?>Q%H6T7c`J17aB9u|ftJ;P` zI|!i258hIJWKX@0)7D&Uu|JvKLRh_&!LBt;midoLkc#atWY`dIN*swl5$@o(7t6hx zz|!~*Fj#_W8cm?>>K{^(O{}TNxc2B1V7)S$WVYnm+!*Lu9oy=L-rXL=KFMD_+DKu7 zS9nduq>?`8%5#~0p7}G-b{@~qIDTrO>CKmI8(&J!1GN&Vah_p#qGjB