From d7447ae658c65276f40d05c6f9ba5e3bf1903474 Mon Sep 17 00:00:00 2001 From: Jooyung Han Date: Tue, 10 Oct 2023 12:59:46 +0900 Subject: [PATCH] Cleanup: use shared apex_key Bug: 296524155 Test: m Change-Id: Ibe18eb283a8c76622e5b5fcc92c7148eb3f788b3 --- usb/apex/Android.bp | 21 ++------ usb/apex/com.android.hardware.usb.avbpubkey | Bin 1032 -> 0 bytes usb/apex/com.android.hardware.usb.pem | 51 -------------------- usb/apex/com.android.hardware.usb.pk8 | Bin 2375 -> 0 bytes usb/apex/com.android.hardware.usb.x509.pem | 34 ------------- 5 files changed, 5 insertions(+), 101 deletions(-) delete mode 100644 usb/apex/com.android.hardware.usb.avbpubkey delete mode 100644 usb/apex/com.android.hardware.usb.pem delete mode 100644 usb/apex/com.android.hardware.usb.pk8 delete mode 100644 usb/apex/com.android.hardware.usb.x509.pem diff --git a/usb/apex/Android.bp b/usb/apex/Android.bp index 765aa2134b..789a3fcdbb 100644 --- a/usb/apex/Android.bp +++ b/usb/apex/Android.bp @@ -16,26 +16,15 @@ package { default_applicable_licenses: ["hardware_interfaces_license"], } -apex_key { - name: "com.android.hardware.usb.key", - public_key: "com.android.hardware.usb.avbpubkey", - private_key: "com.android.hardware.usb.pem", -} - -android_app_certificate { - name: "com.android.hardware.usb.certificate", - certificate: "com.android.hardware.usb", -} - apex { name: "com.android.hardware.usb", manifest: "manifest.json", file_contexts: "file_contexts", - key: "com.android.hardware.usb.key", - certificate: ":com.android.hardware.usb.certificate", + key: "com.android.hardware.key", + certificate: ":com.android.hardware.certificate", updatable: false, - soc_specific: true, - use_vndk_as_stable: true, + vendor: true, + binaries: ["android.hardware.usb-service.example"], prebuilts: [ "com.android.hardware.usb.rc", // init .rc @@ -50,7 +39,7 @@ genrule { name: "com.android.hardware.usb.rc-gen", srcs: [":android.hardware.usb-service.example.rc"], out: ["com.android.hardware.usb.rc"], - cmd: "sed -E 's/\\/vendor/\\/apex\\/com.android.hardware.usb/' $(in) > $(out)", + cmd: "sed -E 's@/vendor/bin@/apex/com.android.hardware.usb/bin@' $(in) > $(out)", } prebuilt_etc { diff --git a/usb/apex/com.android.hardware.usb.avbpubkey b/usb/apex/com.android.hardware.usb.avbpubkey deleted file mode 100644 index 0302d6341a8d8544bba9fc9ae7c19217e95a7d3c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1032 zcmV+j1o!&@01yDzOJf(o*ru3x2xNNRr*ZdT^;$K702&TCEkO?=EC*Mnhzr$w&M;C* z`$OMGcGfYnlelKJt2$W1HoXu-G-}ycI1hRu5Tg~)ihGpdNI6TD_7}qGTFo+L<3+&< zDrX9YbqQpfFD|9_`cJyU#-wlfEdaD*^{*e9*S9!A4S}?5?HWqDFZ6`nsa(I&W zwrw+hAprH8yA)lB$a%hQkA8Tb)?N7GCHWkbxGI%>-g9R!R-hj=c&v|K4-wz$v@W=B z;b)Qt>~wtAZjT3BoOnq&23*<4`0d@kMS)+f3_1L;eUWhcCbQ;idn@Pd{azFUyvm3H z1vBDxl+gYCLkXST7cqt{aTEpeS+3#PT#feI0&OH#3KSB^vmxUTF0&)^e(qLU3M(=f znEMs6^BS!G%&mTtCH&n|7iQC1RXbQT!qLemcbG!KCpeDLjK8jAG%r11C$GI}y{9MZ zqrfCBR6glM5>~mE7kAMR$hER$o(1XMNFZB%nK=u0InNK#>ODv)!IXPKR=+TR5F5lQ z4@cUFb$!~-L=maNsu{3bK6xC4AhURiA5umJiMQKk4kXtmJlhc}X5)J&T=H^(kK+uX zUF1tm6|sEud3PLUL6(y1ur)1e*t`tI@fUdEQxTMp(37n02Ez2#J)L|SqPOW@`uLEU zHXGa;Rr^^WRlmI4HW@G|$Yuc0SS@T;3W^}eZ*nR^?XuoB^$gwSO2ceS=w(E^-tgs$ z)00&ByC>+->6W@l$ryWCPx9rp%0T^*o?@d9ocJy03KHOtcpJK9&CWrkntX~Ph)hGy zbY*`jf3T-7rerrwbPG{eV^MPJEN%$T!Ub+gDN%_XzCF_l^)M zN9dxbtyR!Z4P^$i3Ioy}kV#&OL8?K5+Mqbo&PeDn?Ha@G{#kD*{PJqAGf$n64L-9qW02G%=BoxiO_f^U}JX)SKy~Z%Ja0eV& zrX5DS?@IRgIdekO=v_9IVDv^2f*i^!Ndqfj0c?F?yhKhH)pqOB)aX_f~p=+mqu{~P-* C-u*oQ diff --git a/usb/apex/com.android.hardware.usb.pem b/usb/apex/com.android.hardware.usb.pem deleted file mode 100644 index e1e57da67e..0000000000 --- a/usb/apex/com.android.hardware.usb.pem +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -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 ------END RSA PRIVATE KEY----- diff --git a/usb/apex/com.android.hardware.usb.pk8 b/usb/apex/com.android.hardware.usb.pk8 deleted file mode 100644 index 9f3f39b57091fff21742e997ac494c43cee0764b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2375 zcmV-N3Apw!f(b(c0RS)!1_>&LNQUwEii%!DFOii0)heo0L_HZPi}10 zKcc?t^+FsLu(+47o-;x4w*;e2LY38@O7648p+m&o#6EEstes>U%fbepiHl;JKp@Aw zu&{#ja`01IoK7flU(V{QWw%#eFjIges65TRii(Im^3T<%e5_o%yRGx>PT>3L*H!#c zd$Q(3bAQE#q+oR7PL$}YK&#J`^X?(`9aO#+n$QP^^@?`bywNQ-_b2Cqpkc|LIu~Nc zeNXr=dEA#OOP|tJfp2gquYbZqx?KrvzlfIZ0VhFq_@$);p=qcw%WNh>#xb2g8Cn0W zAT}d|d}^sv>GKeWJ~mi$V0Hn z{T3qm*@d6^2-kh8D#DiTqf5yhF8l)8pf=@Nl0OZ0=tcE=Y*eakHVgio?2y%=%aDfq z2|9V{X5PFb2r%{!@hl?1^&2xE*BnL5S*aQG934Q7I>9=v4*~-L009Dm0s#QAZu$MG z<8oA|XjlaO*NjVagBk1VYXPjV=U@Ass=5Udg2{iTYR z$Rk|v9^ke>8IE0!6(rX~B!BQ?`bH4UMctX^AWW zUeodYn$`$qP%zz?`M!cMRJA0yvhd7Y;O-h)vW|~bY?ZDtQ~_9=P|2kuV8NVd&iJj0 zYlvbLe2s974j#r(2dGMx7G#Eb#ej0jIM-^CXlEt51H1Aq8{aBemIcR!@}$vf1RoZh50k$%~412 zOveM}0X@Gc<_k3hS};}Trv?pjCH-mq=~SiD$xHU8=9+`?Am9lCf&l>l>9slb)Ib;v zUNDHfwNuHM_`c-T3=eZ)b9XJq5_bDpEoo`sl}Cfayw{xHY?jvv_;Us|L9vQ{pO!XG zHfVAW(26d=3nfWE%Z_EP2@W5MrS-iv7(>sBM4%Obkn;3BHn*~$`=Uqc2kmrw-1`y96gUQ~HoO=){vqd+#A zmQh7MZwoBr4^jF5hle+xxkgwTOc@p`x%U8mc0)hbn0O21&7HHDq z$p~tPBr%}sfqf=w$FEdO`HJ-y0c&nPDy}EGp!*_%HLc!wF0WHP z{exaTQe%4qmHG#Hge=F>0o77i-C(?k+Je~xbYsVpjV&Ql<6~{=4JOL@OuTTDt;D3; z#U?=oB-3-TT`bYTw~u(SnmVDaBkYFZ0(^*40HXd?IlmWzkGKtTnpJ5BWRGuHwx2EH zXu#%niaxp{BR_H+5u_mkug|JkU0ksX!G-LR-P?97nbBUvg*nzOB^~2|=|Q=>%fN48 z9udQxU9EAE%&`2$a;1q@|DQsR+4V{Sg}9QQ7{cGWz8m7ezlvu}69R$(0AQww{W25# zo(ak7l9(>JeW1x%TV5=Ao0i1i(mhJ0ap2tQV{Lfw-X9mx5qcN0^EjB`Fq@NOtvR*F zGCr4;5s~70rW|%S_Hk`=(91X5k-4oEJG!p#udF-VeJ^{mA`4#sUU!z?KFpraTm(-9 zMWonhxr^h$&YI0+TC8eMdd7$zrLg50{=IK-5Y?l+jDI{4mFuo zyP}k%ok>v!+?X=;3iuIrUN_#`1!eVf27eFYkhFGm+ZTi=ZtYYu?E-=U0RX+MD4D74 z>{qt9yEA6xHOv#&mxKZIM7<05X+3&nP}nzj&UXF9>;Ww^usb7)qpFyV1*#T!_eWMf z%U=3C|7(~RfB5gUHiOT4_zcBg;W2z1y)9+SRQ`WQ8ligOww*#7%ybesH+`7XJqgZ1 zoJ{H?BqLYp1qs~-NwLqizvPnpzcwO8t@Qg@o5i1wtKGni9b4O#u=Xi>8CiFvH`#s~ z8O3U;f;^4~BrU;t@%~2(?Fg0b59cC&q{;(*LzL=bO9fG&}O9FQrA198jcl#%0dKy zj~iL|dMplz%%5rY&XR1HJ1F9+hMFA~sgr;uF}-43)_l0n;w&K*iuWusr!CZW3DO}E z-vq+3wg@SHnUu6`c%J&?&SpSoA7qcKTmnc^#^k$pkj_imd*T-cv~T%u6tIl;9M|Sd z*Pbqm+J%Ln-SO@X-Q&#b?UmubM6#@+Gr@&);&7