From a0b0a624ffd50be4e999cdfdfd06094858addadc Mon Sep 17 00:00:00 2001 From: Jooyung Han Date: Tue, 10 Oct 2023 10:47:36 +0900 Subject: [PATCH] Cleanup: use shared apex_key Bug: 296524155 Test: m Change-Id: I2b722872d1a93952186a38a385a3e0cd1869b7f5 --- power/aidl/default/apex/Android.bp | 15 +----- .../apex/com.android.hardware.power.avbpubkey | Bin 1032 -> 0 bytes .../apex/com.android.hardware.power.pem | 51 ------------------ .../apex/com.android.hardware.power.pk8 | Bin 2374 -> 0 bytes .../apex/com.android.hardware.power.x509.pem | 34 ------------ 5 files changed, 2 insertions(+), 98 deletions(-) delete mode 100644 power/aidl/default/apex/com.android.hardware.power.avbpubkey delete mode 100644 power/aidl/default/apex/com.android.hardware.power.pem delete mode 100644 power/aidl/default/apex/com.android.hardware.power.pk8 delete mode 100644 power/aidl/default/apex/com.android.hardware.power.x509.pem diff --git a/power/aidl/default/apex/Android.bp b/power/aidl/default/apex/Android.bp index eb040877a0..4e22aa0599 100644 --- a/power/aidl/default/apex/Android.bp +++ b/power/aidl/default/apex/Android.bp @@ -16,17 +16,6 @@ package { default_applicable_licenses: ["Android-Apache-2.0"], } -apex_key { - name: "com.android.hardware.power.key", - public_key: "com.android.hardware.power.avbpubkey", - private_key: "com.android.hardware.power.pem", -} - -android_app_certificate { - name: "com.android.hardware.power.certificate", - certificate: "com.android.hardware.power", -} - genrule { name: "com.android.hardware.power.rc-srcs", srcs: [ @@ -46,8 +35,8 @@ prebuilt_etc { apex { name: "com.android.hardware.power", manifest: "apex_manifest.json", - key: "com.android.hardware.power.key", - certificate: ":com.android.hardware.power.certificate", + key: "com.android.hardware.key", + certificate: ":com.android.hardware.certificate", file_contexts: "file_contexts", use_vndk_as_stable: true, updatable: false, diff --git a/power/aidl/default/apex/com.android.hardware.power.avbpubkey b/power/aidl/default/apex/com.android.hardware.power.avbpubkey deleted file mode 100644 index 3b6411d994b7ddd4d1dea9b8745cae991818bfa4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1032 zcmV+j1o!&@01yDYy7qmsM@5d(>eHK6DbyX|sQg#EW>7%lo;<%5SeNIDrtzvrv{FmrYS8`I**D7MGbK-P$|SKsOhRbbX#^SDCT=9iiw|@9X^9|H zn@kYO3{J3feav*^XT+7MerBVEC=BCyOlV~^cJBgP>&^v5w}j)6{>zBz75dW=dh+?A zI~upcu~6qysj@k+l(y7uX+1dVOO%){IKWXL)IeWxW?a_H$k*M51~V>ZFnp`KiXJQAsQM71q zx!MAbcijOduR7rDL+`R5B2&F3wlX+Zn=H3vG7ZGFwU8%?Mk>JfG3cpIidta&K2rg5 zY5Up2a>m(MyA3GE;RLnWWm(g|EkoV@Z-zRM++7Vo5Tyx}o99_{7#uuGFi#%4UqP(Rym!7g-lQ`U8EWLS(&7#mirQi^qPS6U|qxCFV8RHcv50!4n;4};5%>IZJqtq7!D za7>E!&Q^2GPr3FISk7+1agj0une{K4);VxSi|?%TD6!0_^fM}ST4|RhnPL*NDx=(R zofT;2>&%mVAURMAL<;m#-J1hdMrog-*r?UGJjhlFOu$<98!%iEmu}Uj6|4YiZWMg= zIJ;ItP4E5;^7=oxf$_%yOD*+@=`6=LyJ^kHy+mY>#17s`z1*J|YZXOMuh9zEc+eZL C(hZ3K diff --git a/power/aidl/default/apex/com.android.hardware.power.pem b/power/aidl/default/apex/com.android.hardware.power.pem deleted file mode 100644 index d18ae981ca..0000000000 --- a/power/aidl/default/apex/com.android.hardware.power.pem +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -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 ------END RSA PRIVATE KEY----- diff --git a/power/aidl/default/apex/com.android.hardware.power.pk8 b/power/aidl/default/apex/com.android.hardware.power.pk8 deleted file mode 100644 index e45435d8b8e12fda9c609e7267fdc0671203d1b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2374 zcmV-M3Ay$#f(b$b0RS)!1_>&LNQUwEHHuzC;|Zh0)heo0Keb2;W|T~ zfX$xx&f74ZTWGOjf5%E21X}883G{WQxabjaGNqS0gdW<-(md|3cLU3>^r4iW1MxL- zO~Z8&%t5DC+oDo6C^~#4J%?EX&PJqW46EEb37ny*NN|bSU8Gg8r+1;QIir--mPktt zNca_r4bAP=W>2%t18TnihJqQM#gU*--dX}fab>J=8!EXdzN@Hms!*Fo{1MJ`+6-(a zZ-^co+n@<~GZN6O!S^|iB>WCD1Cj-781L3`i1ry|^eaLBW&J{!L%n4JLEmpsqx{G>s5;8mKecbwG*^-m%(yZgrE~PkfF>13D5glvJRkNx6I|CX6Bi>a3ymtq2t9m2bFRI>t}HW zB`kikkDWkd9O}Quz@o}YYE-;@Qy^=g@1hs?8L6}%h!=cY*#ZLr009Dm0suD~18#N` zQO)K+59ui0Z*u=YVy~PA)_04%;_2@JlOAi>29T>NA@{NT*cHE4HKLNfe+*p{m=D9q zyU9hTYqKNo@oXm4L0k%7`8p7jDjKE(H6zl0@0_(2V1-?L*`}d6(*R|~Q;JST!ieO) zSyXA8mA@A=g>B&49JwrkDpm0-c7ywD^+Q0)fuJF|Ldvk5c!lR^(xwnG6_Zm^tI5D{xG-DPk2kc@B$j0$%E~sYIR1 z@ITo?k4#DPO`=+n54~aCaSVb85`QgbU(v_6Kb3n`53n zXoQ7xzvXfas00briz>hj9x~khH%}E#)Nf*&)Y18QYE{`$Dy^Zc|KAn3ehY0L#{)Z{ zZ(4nxa=(tRSQdP$kqstqvJByzsrf<)KubIn+~g$977FjjtE_j*JS3n}D}3_c z7~Oaa8d~<$*Qv1ubY1z)CAIh>V`g`&IN+g@XK)nf1Wq}fJZkW-&e)vtuWOq-h0#(k zp#&{T*J-whm@llPpH|V4!>H=96RTrg+uRZGOQ)uZsCe z(NgkB4zH`<{7S5bL)hip+HSUt*GIZbi9z#O=7B$qM@Mf`{Q&}k0RaH#S}s1=uQrh( z?V=DgVO1@*!6BLpMHurdK~YH{S{kWB)h>II@e(b7T-QriO|Ho85w4h|$`Zd#I{o_J zH3->Gsgc*0Nvh}fWj9&JvDwILAXWUTX_maGM&G#t+f&l>l)KJlsWdx#2 z`b0M%)P5htCW`ok?5)0B@Yvnt4+2!+=Ch(1guc+tkP1Y3U~d#T$PtdGeeHwDlQiqX?yjqcDnWf(GsZ*{I_)V^; zV^iU!RV(uM?&wiv*)iHSi%jzg1}O(thJaZG%q-FVJNzGhOL2o#tllvX+2;cbh{2h|D8<8szeMR_>BT=LP( zW%Qm@L373KPmly9)a$BsR4j=36`u-aF?}zTn%>R@z9+@p+o2lsRt)u5r9rly7hIte zb><*Bkps*sQ9e#+rEFQrTZJU;x9ZeEOL&lir9HQ;epgG_hiG_(#R$!jtCmmC7(6k{ z;XVSD(G`={OXsxifbTp<JdUpa5TpybtIx$&k8vZO!Z@>_tLSptFq01r9rjnm-G zGTpP@us{s^f;q8exk9i5BJVQZR_LszA*$)$3N3c=%8WJeOEeopJQJK{k84MeF+rH? z+D6MriJ=S0yJbGK1o41Q8{?3s#5CkwSlWnyliwKfdgIhhAJkSlZy1Hh!&CieQfZh- zno{LO9db%QmVZyN=C}CQNopJpq3a7SH;Pr#5TXygEHQ#Bd{b&&YN)T1FV4ck?i?;ZYc31;jIFMzRPX^Nl2bF-Z zemzV{f6!N;gOy($%6Z9~sS03Bp6Ez}{& z-<{=&hQ6_Tox$bCst?;S1o%j~m`L#_uG50t&p-f1%s?>2DJP`m_oEjX34suk?oL>8 zAi^7C>65~^%&ymEe_7>6$apMeK$M0eB09&ZQMnbFs1Ia>Lc&}d?`19EJp#`RSm>>7 zOXlNd<7dYIe*y%pGwN|1S|>UUW#PBn7