From 0c99f933513ae4e2d3143ddff529df0b9207f88e Mon Sep 17 00:00:00 2001 From: Yi-Yo Chiang Date: Fri, 7 Jan 2022 18:34:54 +0800 Subject: [PATCH] Remove unused rootdir/avb/*-gsi.avbpubkey modules They were moved to test/vts-testcase Bug: 176869478 Test: presubmit Change-Id: I4f4f1c50e624125c839161d83e28f051099e6ec0 --- rootdir/avb/Android.mk | 52 --------------------------------- rootdir/avb/q-gsi.avbpubkey | Bin 1032 -> 0 bytes rootdir/avb/qcar-gsi.avbpubkey | Bin 1032 -> 0 bytes rootdir/avb/r-gsi.avbpubkey | Bin 1032 -> 0 bytes rootdir/avb/s-gsi.avbpubkey | Bin 1032 -> 0 bytes 5 files changed, 52 deletions(-) delete mode 100644 rootdir/avb/q-gsi.avbpubkey delete mode 100644 rootdir/avb/qcar-gsi.avbpubkey delete mode 100644 rootdir/avb/r-gsi.avbpubkey delete mode 100644 rootdir/avb/s-gsi.avbpubkey diff --git a/rootdir/avb/Android.mk b/rootdir/avb/Android.mk index 647cfa21b..8cf317231 100644 --- a/rootdir/avb/Android.mk +++ b/rootdir/avb/Android.mk @@ -14,19 +14,6 @@ else endif endif -####################################### -# q-gsi.avbpubkey -include $(CLEAR_VARS) - -LOCAL_MODULE := q-gsi.avbpubkey -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := $(LOCAL_MODULE) -LOCAL_MODULE_PATH := $(my_gsi_avb_keys_path) - -include $(BUILD_PREBUILT) - ####################################### # q-developer-gsi.avbpubkey include $(CLEAR_VARS) @@ -40,19 +27,6 @@ LOCAL_MODULE_PATH := $(my_gsi_avb_keys_path) include $(BUILD_PREBUILT) -####################################### -# r-gsi.avbpubkey -include $(CLEAR_VARS) - -LOCAL_MODULE := r-gsi.avbpubkey -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := $(LOCAL_MODULE) -LOCAL_MODULE_PATH := $(my_gsi_avb_keys_path) - -include $(BUILD_PREBUILT) - ####################################### # r-developer-gsi.avbpubkey include $(CLEAR_VARS) @@ -66,19 +40,6 @@ LOCAL_MODULE_PATH := $(my_gsi_avb_keys_path) include $(BUILD_PREBUILT) -####################################### -# s-gsi.avbpubkey -include $(CLEAR_VARS) - -LOCAL_MODULE := s-gsi.avbpubkey -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := $(LOCAL_MODULE) -LOCAL_MODULE_PATH := $(my_gsi_avb_keys_path) - -include $(BUILD_PREBUILT) - ####################################### # s-developer-gsi.avbpubkey include $(CLEAR_VARS) @@ -92,17 +53,4 @@ LOCAL_MODULE_PATH := $(my_gsi_avb_keys_path) include $(BUILD_PREBUILT) -####################################### -# qcar-gsi.avbpubkey -include $(CLEAR_VARS) - -LOCAL_MODULE := qcar-gsi.avbpubkey -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := $(LOCAL_MODULE) -LOCAL_MODULE_PATH := $(my_gsi_avb_keys_path) - -include $(BUILD_PREBUILT) - my_gsi_avb_keys_path := diff --git a/rootdir/avb/q-gsi.avbpubkey b/rootdir/avb/q-gsi.avbpubkey deleted file mode 100644 index 5ed7543ba22c4164b0ab153828a6b3bfe0d1289f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1032 zcmV+j1o!&@01yD(;c0=8JaJn0B0#<(DW{QMqbdDcP`qtY2!e*!F^e6}Uj*Jb>60*lA@oN0+(ajXIPdhR}&EUp?c(M^6 zi*QoVQBhKj!KWq*d*l{4CsrCjPc_Fuu8v^`Rp^fgyHTTPs{5~o zI${|X;W}6)4A9YrMpXsir%JTapb#0aK>*t91*69lx63l$=)`5FAb}nv@{A{K6;6oB zs4W*Jo&8ca=g~#N|CN1}Pk03eFrp7Q6y;&rG4OE4EDTovT2f>ep%ExHBSQfkAp8;6 z!8M@G=LF61h~eo|BPyl!U1s&kdA5VjP&o2k!sMk^|`lL}R?dgf7vCA5}v#q98-@_%D- z!gj@qDsj@0jjiEA;A!UWoJKZc&;X*D)bIev@a%L}YM$312A*h|vXmcgz-LI9qJM-ATQ-^oFFzI~*DX*Gte zAaJRnzsg165Io~`G$9w7;%mn#`#=eWX&;w75Wc&d}2*#pDOG CUkH={ diff --git a/rootdir/avb/qcar-gsi.avbpubkey b/rootdir/avb/qcar-gsi.avbpubkey deleted file mode 100644 index ce56646d08bc2038bd712d611abb6f6ffacf7b79..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1032 zcmV+j1o!&@01yCT`U;!6j>|$x__CBmd@XRPC?hjs7!oZ#&P8q?M6i*1-?p&zx+g+~ zQbpJx9pb`PjQ}x@F;C_B9p+^a3f}S%`4LOWwLO%i6$=8j4u5%*=*zw&VE3yQFHg?y z0SjXvdlphZGDq* zL6X03UxrHOA1$F8#Ij)fD_&}yacYQl>RCnoUzFpR=yh&<@ZZ{|-H=Iuy5qD6M3W3e zg$>TTf*Cz(4m!ujf-tHzt?w?%+fvdIhm}>7QrV20PlJ(=tPEqB?=Ls?6iYeuN+v z2I?!ClCC;@`bb@Om^G9nPW*=7T&JiNd|xB8)qvb{h()eBycLw$nJZ2R>Ys3)FnB}iIA1JWhS7PaZb>!*YAU4bt-NOMa9VS=3of0i7@F?UmEDsyT5q}I||;$b*8X1Drivp*xBYm zKrQccz%oc6N-7%KOZtk6O|3DAW*_F0DN6fNumKis=$p3MWICeMWDcd;Ml2!Y8hEz+ zNT~LV>|#ki8`b3PDMl&PSO35J-vc;jlg8cZV0;x<-7OG<`qG1KR!1|(SduT}g?^sD zEW$qaADt^DKWK^rY8gC$cqx?r&>K6^GQWWh6=S9ymksH|9LkVKHIn#boSiFaWeF*#{t zABNhc|Ai+Eh!+PH_0EJ4+W_mCqf0SQJ@lKiI_H_P&^>IOF%qZ$Lp!lfwu?Llhzvj3 z6JqK^4P*Y*2%=L)B@QZEti=5Ytx5oO1no^}0a1N4wWV=D}*lXj|>G`Rs8NSo~n=0BYbT8TV^oVTo`sHrqh>6&@aJ z`;OsX5G33grNyPXTdT=V;ijBxL3G1MD~wQeltjvuuC-7vDhe3s8Ip#gGaFwV?(x5y Ccl0a( diff --git a/rootdir/avb/r-gsi.avbpubkey b/rootdir/avb/r-gsi.avbpubkey deleted file mode 100644 index 2609b3037eac08b7ea9653dabc9e8f6c090b08e0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1032 zcmV+j1o!&@01yCX{@#0v1$Dzh2>)~!ai+Y*rAQU%fefCJm`H}0aEcJk0twPGe4Wq8 zc#Z1LW{!i38&+P9?;4B^;p8Jb{u~EZ-uq$Ttz-zH1LF2h#|nIhdYi|E;Mf;5%6v=U zRTi_cHTs`!s7W#*i#f6w7B^FoBTV*&9`#>5@kQvKl(h{qofL19rq-`v?scQssc|sX zZ>E-)UA_iQS^<1l@c$BL39iNw*LJ>o=PZ>yjHt(2jnU)1vdA!$>L6=$e4Ht4g*P}m z98?QLKgepC%HL3>d%Oet4AI2j%;UV+Sg=wpOAFp6FGTyPVVKWbI}A~qtBTJ$3`w*} z*Tm3_;bJR6=a7@(S~m%G>r~h`t%Z#`nBD$DzWKZJQxmkeCozyqz$N!RzEWFYoSI&~ z-W_|DtKem70$xmF%i$oN$kSqqjZSd(p(JjLm0?BS zxPu*-SYEMld(ViszGK<2UH+Ee8q8oD)nx@)`((`^91Td>XS) zud*KqL$EU7+tG3ip5TGHgWSU%P zgt(I?{j)qxW&m<=qOW>pB699(Y@V|IT3^3y&i`y0?&PW?zB7=lu!??8-Hl?(xujJO zc8?bh8Fc~Db^}?whdyhDy&>TLS5rFLni@d4^H?pQXz55-2xB_b$fayN_pD5-_Oe$$ z-EtNzg4=$`bRWm#7#6~Gn}!wX6G(=z>EsK9=d_7L*J>`Fj)IirCYI`4-)${XSJFOz z=IE$op6OS4l`bE!d43>8JZR$pLel6DYw2ydaG=yO!GSIRkg+&>`O>SFZg^H`1fJp) z`@sVE#%Um9>0jEAY}(SCVaeQR|T16QD69CoWYP1&%M_v|MIsT-qV5y z)kf}5u1TqRsU1eZT#u`Qwv-gXd+9@kvxIC&3R!`p%qeTdI?^VVZEFx#?}F$?vOSy3 ztvSKEE{x>dV}{WGE$p%|*n-kC5S9Y+j*o7VrL0=ut{- C{{=1p diff --git a/rootdir/avb/s-gsi.avbpubkey b/rootdir/avb/s-gsi.avbpubkey deleted file mode 100644 index 9065fb83ff23ca5a0ab7c238aca0e88257cb8b23..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1032 zcmV+j1o!&@01yB@P5GIx)IH-|v#Q9k-S zfvOD;X$WYMAQJ(p{s%jweHi*$B0Uu~|FG{6L^twr=9a`Q%`+-WMpcENA+~D_MOX@C zhk_8_3lV!4*Zi2kJp}0=yjT=K;9=mCuH+af)xC#R!Q zXWensVlX?h0%#2J6H6&;X=Y)cA^u0CfiJ5Wt=rL*3_A}<4F#9MWQr-M5BA^rb(zm5$&p;a?FjL%tr!wZl_W zjx=~K*xVx}E}TN3hrHfWmjkgFqC*AcYiPLsD>!{qke;@CsZ>)XMbiImg!XbNxBn+)ra?@>0wuu^m36 zV}vQ&Gc~?6x(RiC^Co(Refb@Y{SwAyL&;}=s#aKhDC802R!J#?Err{s{BYq!k~QLe<})**@=&b@gPK2dv5*eaCQW_2R83MP1_Zl+4ZJ${ z_EV}jOlViwG#sjc3!d$poryOYVT@Q;Zqo{b{b1a_yZ>Op*Ik}Eum%zwu9bA$NJgG& z;7x?I_>@#aaPV;3qSwvFgJGUMAHa==|IR`?SVRA<9)edfcDl6wd$qCW*XhyyK5L00 z7C9oC&mzH+8R<)-c5dyEIf7P0GnQQ&d7DbdICY<(oCA_>`E0A0-=&Y5DK)V8LV7I_ CTlMq+