From bc09e453a5178f899420c60226d4e81b9a10f793 Mon Sep 17 00:00:00 2001 From: Jooyung Han Date: Tue, 10 Oct 2023 15:33:40 +0900 Subject: [PATCH] Cleanup: use shared apex_key Bug: 296524155 Test: m Merged-In: Ib04e5b2f1f2719b040656237f3759502d14e3d3e Change-Id: Ib04e5b2f1f2719b040656237f3759502d14e3d3e --- biometrics/face/aidl/default/apex/Android.bp | 17 +----- ...android.hardware.biometrics.face.avbpubkey | Bin 1032 -> 0 bytes .../com.android.hardware.biometrics.face.pem | 52 ------------------ .../com.android.hardware.biometrics.face.pk8 | Bin 2374 -> 0 bytes ....android.hardware.biometrics.face.x509.pem | 34 ------------ 5 files changed, 2 insertions(+), 101 deletions(-) delete mode 100644 biometrics/face/aidl/default/apex/com.android.hardware.biometrics.face.avbpubkey delete mode 100644 biometrics/face/aidl/default/apex/com.android.hardware.biometrics.face.pem delete mode 100644 biometrics/face/aidl/default/apex/com.android.hardware.biometrics.face.pk8 delete mode 100644 biometrics/face/aidl/default/apex/com.android.hardware.biometrics.face.x509.pem diff --git a/biometrics/face/aidl/default/apex/Android.bp b/biometrics/face/aidl/default/apex/Android.bp index 2f39a0839a..0ae14638c5 100644 --- a/biometrics/face/aidl/default/apex/Android.bp +++ b/biometrics/face/aidl/default/apex/Android.bp @@ -16,27 +16,14 @@ package { default_applicable_licenses: ["Android-Apache-2.0"], } -apex_key { - name: "com.android.hardware.biometrics.face.key", - public_key: "com.android.hardware.biometrics.face.avbpubkey", - private_key: "com.android.hardware.biometrics.face.pem", -} - -android_app_certificate { - name: "com.android.hardware.biometrics.face.certificate", - certificate: "com.android.hardware.biometrics.face", -} - apex { name: "com.android.hardware.biometrics.face", manifest: "manifest.json", file_contexts: "file_contexts", - key: "com.android.hardware.biometrics.face.key", - certificate: ":com.android.hardware.biometrics.face.certificate", + key: "com.android.hardware.key", + certificate: ":com.android.hardware.certificate", updatable: false, - vendor: true, - use_vndk_as_stable: true, binaries: [ // hal diff --git a/biometrics/face/aidl/default/apex/com.android.hardware.biometrics.face.avbpubkey b/biometrics/face/aidl/default/apex/com.android.hardware.biometrics.face.avbpubkey deleted file mode 100644 index 9f358fff6684c1727689973ee10647df4a1b1bcc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1032 zcmV+j1o!&@01yDOImVf&XKxBsd_nd}7tHu#@|9AWBNWpYAyb3opzFoXYW=sC`>YLf zn=^}!Lsl}pZPjp;5%Zu=b9vJ~Q{&DZq((un0teqyYDnt;PsxVm`q=_QV9{!yfnR_d z&1MSVKAdhE)5qovz9$nkV2ZRaT9xxeBS@d(#K-6c;EjqK!3J13g`YL>NK!`PezdLf z&@^}~dOQEqpk_QN(t@2jE*gnU?WiQ6iB$|=J4DYlM|~9~QeD-q9l^xf3@9AW`wRVa z1>AgHaExpO5o?Ecnt}PD8=;3^IMn+{LrOEl`^RdKlbO>Sj%XXgmD%Ia-@KW2a(wx7 zk-rH;we%?q4cuRT!Qtb`%TqD+ofsThZGr-Hh_lJYjVCfVpnigXH`YhIY63=WQS8(z ze>m36W#kBiLiCZ>t0P<0qUYWP{rvoocdnfJJ$iXIB=9FN>li&)A;^3~yS+pi=pmk!Xc>)rLn7H_JCcO5pb>F#F455Gyq6RhCD>?;$j)cybBC_? z3){YTYbD9`H3h7Dw(&H-1Uq%9XHn!);A(3qNNerH=7StKCbIjes}?xaF;`cTiw%gb z(9DgaW?nn!NiN|bVeKMQY!WR4)yM4MIMphq6(b>AN`u>Q2e)){=m-&W6W#WgyEKG( z0)u^?sVX;{d;$ER>dU%(p#2}Np9divP()zAQ9x3)XI}j3Nc_u6JZ&;+eiJ>jiBm;( zCj_~cnSEmAwU#@VYQ9&^)*ykDgTO^b^&*36d>$|4Qwq^PBEZ|DFrN}&ps-{GGI>n`iDzfC0((v~*F=`@E;?>{T~^bQ|4Iuc0{=M3!y3U4}Owx5wSi$?|Qf zrdA@GRJJorJA(j#j3}^XRH!?On+4U=;BZ=8VPT1iv;H2!~-uC{9=w44j CZUtWe diff --git a/biometrics/face/aidl/default/apex/com.android.hardware.biometrics.face.pem b/biometrics/face/aidl/default/apex/com.android.hardware.biometrics.face.pem deleted file mode 100644 index ad8f57d544..0000000000 --- a/biometrics/face/aidl/default/apex/com.android.hardware.biometrics.face.pem +++ /dev/null @@ -1,52 +0,0 @@ ------BEGIN PRIVATE KEY----- -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 -ZJpVwCxgxAOagrQtvwdedbmvChAfGA== ------END PRIVATE KEY----- diff --git a/biometrics/face/aidl/default/apex/com.android.hardware.biometrics.face.pk8 b/biometrics/face/aidl/default/apex/com.android.hardware.biometrics.face.pk8 deleted file mode 100644 index af0ff4e75a5afc404d4cb5a7e1fd86660f8a5349..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2374 zcmV-M3Ay$#f(b$b0RS)!1_>&LNQUwEHHuzC;|Zh0)heo0QQ}nBTo|Y zjUNyKX5GU2(KfCIx`CZ(#rx&JYBf=hasw9-jJ>u=Z+AEjk=@t1y7UxmczbWyIRUd+ zaT)PA$gWVWmq=xX4#zRLYEV=vVc>0RTqCV*IkVN4_}cUf2qXs|EOR5aMD>oouRJ)X zcrflU>FYl=H#B^Qy!w*K5O{+Am2o=j7b7=qoetbijj2u&{^G>xztf3$ z``6y9=fK<=@?a^v+irXR4ME0zp%SfCm@ZB6p?%l!Qg1)F$TQXGWER_iQs4moLljHj zZ0k!~E zjJWc%vn`4;C+edhcqxQ-;6ODnB>TS#t{&>?`66qW*JKq{+k|CQe8QjNbXniF{W2(? z(mS*}5`7DN*yiMU1j*_WI;#G#m!$}Kqg=jiW}G<%Y0@MXBzN-gsUwCIH9g%`dWB^6 zU4yU!R-3D*z{|!S_>pq_;05TzIadVJ9x)C-lfVnMUvIG57Su_PR_a-#Ux~&ZR?E+A zb!>n|tBsG$11Uy!DvZ2lmxXCNg(rt3Y3zz=v)^p*_>2_k`vL<2009Dm0st87ne3^b zxf;;FR zvBwa9q$LOy2u@2^Q(~w18uG`sk>~w(A&nT{{Ih|)+WNq%Jb5st^_&>+>4|ft-x#;W zR9uMRL@FN!Ikrv;b{^EySnlAR4)sz}^0j)5k|)0BW`9t-XeR2K z9s6Qgv7-M4i5OBDBHRcI42Iov;hh}PuWyK9ad~al_K`6>*7Ks-oZOXYpxrxg{qys7 zuO+Z~y}R2uwC}dlb7gQpuKWFLT?|=&tHvuEj^+Y#RY{&mfVe`QsAxr_FDG*+?iC$i zM4G40OSmqyl6e)xksTc5C^SVVGhXDVY`%BIa~*lFWvB>qo0zB1aK?3I{t`E8lXk__ zQy0YeqkAwqUeWJ+X0dk3q1rGY_ccR4-M}}M>$O#HRGeHwzVQNr0RaI0VAL1?y4voY zk%oY!^$5XI)I$6-S0yv(j$*b(vhmA!0_>ccKhjO!DNNOq{zMHwjOZ6Cok;Me5{tK0 zPhId9d(%N1b>}hidwx^`PZ17M{01f-(W;q?A>h1PjnkRu;v8LUWL&pz12@paAXhOO zZZpTbWF5dfPm@{0+C5{8({w>pk{1_0#xCu__#d$l2TJNajCq*YQQxyD{*tmUlrmV# zm%8D_?e*xF>y=v4eh>p$gO(>XWv?heP7`&%DGCCjg!S%gecZJPbSt<==M#mk*&fZ| zWF#qt>UPm{<-&cRc8%ewG2a>eBd`ysm-B3Wfzfe^n$>U7(^b&|f&l>l`6}K!&`PBS z{iO@zQ96W1iO@~;s{^n@TJ*VsHYF9viD&2Hx9ql$_a&fyL7$L4#E^t&z?gDr!Pet0zGTOnE-sDEnt+jAtga#~Zhaj79n>Ly3FHOaQ)@qUo{R960fL^r z%bD$^C(d~_VghVqhs$}xu#yvsmcDUN{W~Fuqq~#uABg?q5I@3Xrlq*~>r!`XMjqlG z%R7pE$;_xV;K%{;Qm2B03A${zf>EzAo03iVmpS(&5#?nA zS?w=(+D`H(xC!esC4qROy#GY=d?bW@Z(AZT7C%kjZ{%6J1JUr7S#PSj!DGO+LNj%3 z4kmF;$W#GZ^DN~_l4XLd+eJ~QQ0=BzqG!3WA0gQec+O$0CA8FJ05zIQcSH(OnlY)D zksE=Rzx5|*m2-fqAEN0@h}1OlVp*P|8}h?0Vu z%IB0}YHffrpqz8KBh~7PsYUeB+%vnLB@CH5*;ib|EyFNr@J+$H^8$ha03i(``iG~x z6H@b$&Ia0?(Y)()pJFxT3ifYIMgndIQU~8P()h)?*)L+}Xj^C?AiHC5rKE#)Pli}4 zP*IEIHR|Y1gWkyP*6nNUu{0KUwCqt6?qanFMLId>BMT5;%|9Q1x3u$H3zSOZ*bjqE+-^K sSHK+nCtE~bK?baGWRaJHu6^VmVck2%Uཟ)!D0a|4l_2u6o%TBkLqyPW_ diff --git a/biometrics/face/aidl/default/apex/com.android.hardware.biometrics.face.x509.pem b/biometrics/face/aidl/default/apex/com.android.hardware.biometrics.face.x509.pem deleted file mode 100644 index 3dc37ffd42..0000000000 --- a/biometrics/face/aidl/default/apex/com.android.hardware.biometrics.face.x509.pem +++ /dev/null @@ -1,34 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIF7TCCA9UCFCmJBOOYRVUgdy8vKm8OQd0ii2pPMA0GCSqGSIb3DQEBCwUAMIGx -MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNTW91 -bnRhaW4gVmlldzEQMA4GA1UECgwHQW5kcm9pZDEQMA4GA1UECwwHQW5kcm9pZDEi -MCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTEtMCsGA1UEAwwkY29t -LmFuZHJvaWQuaGFyZHdhcmUuYmlvbWV0cmljcy5mYWNlMCAXDTIzMDUyNTA2NDIw -MFoYDzQ3NjEwNDIwMDY0MjAwWjCBsTELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNh -bGlmb3JuaWExFjAUBgNVBAcMDU1vdW50YWluIFZpZXcxEDAOBgNVBAoMB0FuZHJv -aWQxEDAOBgNVBAsMB0FuZHJvaWQxIjAgBgkqhkiG9w0BCQEWE2FuZHJvaWRAYW5k -cm9pZC5jb20xLTArBgNVBAMMJGNvbS5hbmRyb2lkLmhhcmR3YXJlLmJpb21ldHJp -Y3MuZmFjZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAPadnCNPEvKN -HxACZt3C+tE2rga6gZ1pxfvlwGo1UY9yAxcQjL22SW93OA6R3de5uvQUbHh7b9g5 -AbNYcRnxOMiuUK2XSGWGDscxuGpQVCph4G1rXCOtbTmz1Zb42vQLCCQHHyxzI7ZE -9Y6+rzw4p3jtEyBSiiErk13GFZTzwcDzqsQs12vDn9ovSTTn5Nyy6Csz7+O2t4SN -qU4S/uLE6b/TiXj7196r58DcGvJgKbzbbnv/DUHGfaESrVWYLk3xoX3X8VJvP7jI -M9XoZBbbgFLgAP5DFEvf5QWS9tR092z0YXOGr+mLHtkJM7Or9nKOohm6aFfHbuvu -pSWyR4FWnaFANQ8wLH+fH485fiO6juJdTuRWeQpZddv0/IgguZ2Plu7z6NHCf5+L -KYFjQ5y716wOufIqHhRLqYnpsAG2AFaMuPKzsy2KMifqoyB4KYR24EA1MCT7vwqu -Hurp+SJrmNdkFVXbhGVUfMKf4nRZ37b9Miie0ju0OxJ9C3zY5uR5BMnqEjqq/rCX -pQh5o1y+bWacOQVp0iQWJHfy8KkjhhQ1Pd1VeoVk9l2DsAJWm6unwMvGHviRcvzg -BejDOVcE0x4xDj+TwAu2X2+w2hbUSY9W6lmkX4nGHlbLz211bIBFq42PzAMpRnYq -jLxml4VpO4UnhyRp7Ipps99s7/iMFOn7AgMBAAEwDQYJKoZIhvcNAQELBQADggIB -AG/5t56hKYKORne0bwJpMSCWZNT6JcYjf6fEmNrvG3/gz9BCuj4osZjJHD2OSUJl -F5yI52RgPrXK8bNqJOvX6MIc4Y2JoSI2Uz4J2vZ3QhRkPC9oqwk/Enz4GIVJ4Dnm -/kgpBbN2SN0TjnmEooptly5tWb3IPTjqLZpaPIW1ntQeCAbgrYVHiMsvNe1BuBrn -RNi1xqw3QGp2ZV/RfJ3MH6d49TswEL1gwiUeg3hw5eG7IDfLB/2IJBrff7kmPTQ6 -n+il4uXuXMmX70xSvJXwP/NinomJsORZ4Npbmp7xV/QJp9cNoxNAo3DJ4OHRAnA+ -L7E1KZ3+nSRxGcVlqBekmG6wH9U39NN+dh758aGdJOWqA+B+1PAGxkvFCNqLgTpm -xNl62YiRRo4FiIAkntvs+JneMEphv/T5i824t2xFZD2lBuW8r54nWj5cpx8AU9W2 -rulR0jx7BnVdj6czn1/pPCIah8Os9pZM8q1CbF8vXD+QLAF0/NjPNomTEGd/M+V+ -sfn1OhLGF/E1kWyNeOmkvX26txQdY8k6jUdsAc5vmQqgwxdorjI38ynpYQnFwq2g -eO4l62sx8icsSh2TRklWy8BwZpaCyO/WVv/FcjIUexYhmZ0EHpmQk/RAlD1f9wFy -CciNa/Dm94AwJgZk9LcXye3BSvb1sKF6C7eYrW0eI95V ------END CERTIFICATE-----