From 83f5cfc36d3377af5bd1555a9fc13a4be6f749a4 Mon Sep 17 00:00:00 2001
From: Jooyung Han <jooyung@google.com>
Date: Tue, 10 Oct 2023 16:08:22 +0900
Subject: [PATCH] Cleanup: use shared apex_key (vibrator HAL APEX)

plus, moved VINTF fragment into VAPEX

Bug: 296524155
Test: m
Change-Id: I1453174ab8229af56cff5886126de77eb9129ed7
---
 vibrator/aidl/default/Android.bp              |   6 ++-
 vibrator/aidl/default/apex/Android.bp         |  22 ++------
 .../com.android.hardware.vibrator.avbpubkey   | Bin 1032 -> 0 bytes
 .../apex/com.android.hardware.vibrator.pem    |  51 ------------------
 .../apex/com.android.hardware.vibrator.pk8    | Bin 2376 -> 0 bytes
 .../com.android.hardware.vibrator.x509.pem    |  34 ------------
 vibrator/aidl/default/apex/file_contexts      |   5 +-
 7 files changed, 12 insertions(+), 106 deletions(-)
 delete mode 100644 vibrator/aidl/default/apex/com.android.hardware.vibrator.avbpubkey
 delete mode 100644 vibrator/aidl/default/apex/com.android.hardware.vibrator.pem
 delete mode 100644 vibrator/aidl/default/apex/com.android.hardware.vibrator.pk8
 delete mode 100644 vibrator/aidl/default/apex/com.android.hardware.vibrator.x509.pem

diff --git a/vibrator/aidl/default/Android.bp b/vibrator/aidl/default/Android.bp
index 78bb4ed0c4..fb71a82ab1 100644
--- a/vibrator/aidl/default/Android.bp
+++ b/vibrator/aidl/default/Android.bp
@@ -32,9 +32,11 @@ cc_library_static {
     },
 }
 
-filegroup {
+prebuilt_etc {
     name: "android.hardware.vibrator.xml",
-    srcs: ["android.hardware.vibrator.xml"],
+    src: "android.hardware.vibrator.xml",
+    sub_dir: "vintf",
+    installable: false,
 }
 
 cc_binary {
diff --git a/vibrator/aidl/default/apex/Android.bp b/vibrator/aidl/default/apex/Android.bp
index 7949057ed4..39626bfc71 100644
--- a/vibrator/aidl/default/apex/Android.bp
+++ b/vibrator/aidl/default/apex/Android.bp
@@ -2,17 +2,6 @@ package {
     default_applicable_licenses: ["hardware_interfaces_license"],
 }
 
-apex_key {
-    name: "com.android.hardware.vibrator.key",
-    public_key: "com.android.hardware.vibrator.avbpubkey",
-    private_key: "com.android.hardware.vibrator.pem",
-}
-
-android_app_certificate {
-    name: "com.android.hardware.vibrator.certificate",
-    certificate: "com.android.hardware.vibrator",
-}
-
 prebuilt_etc {
     name: "com.android.hardware.vibrator.rc",
     src: "com.android.hardware.vibrator.rc",
@@ -22,20 +11,19 @@ prebuilt_etc {
 apex {
     name: "com.android.hardware.vibrator",
     manifest: "apex_manifest.json",
-    key: "com.android.hardware.vibrator.key",
-    certificate: ":com.android.hardware.vibrator.certificate",
+    key: "com.android.hardware.key",
+    certificate: ":com.android.hardware.certificate",
     file_contexts: "file_contexts",
-    use_vndk_as_stable: true,
     updatable: false,
-    // Install the apex in /vendor/apex
-    soc_specific: true,
+    vendor: true,
+
     binaries: [
         "android.hardware.vibrator-service.example",
     ],
     prebuilts: [
         "com.android.hardware.vibrator.rc",
+        "android.hardware.vibrator.xml",
     ],
-    vintf_fragments: [":android.hardware.vibrator.xml"],
     // vibrator.default.so is not needed by the AIDL service binary.
     overrides: ["vibrator.default"],
 }
diff --git a/vibrator/aidl/default/apex/com.android.hardware.vibrator.avbpubkey b/vibrator/aidl/default/apex/com.android.hardware.vibrator.avbpubkey
deleted file mode 100644
index a6ca6303fa058d3bedee6937d7a8b9f7b47ec40b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1032
zcmV+j1o!&@01yC3c7Dg4fhg>8sa4Lla8u^NJ<K{G&;ZfZZL9~Sx_|#2@hi5RE2OBc
zOT1i}>^n&S1NCsV`l_RmpqLd@uZE#p;|cw5*X+~zga@rbWE>b*G-4X2qAg&(FwvrY
zqU-6QeL+d8th~2-%N6Kqf<yv)$Oec-W#fO3I6Ge<r@jHB+fH8*^h(f|aS{deM3zGk
zqh{U<x4e^>=qx}ttIkmFw^9{HVWC8qF;qvG6-mYH*dzVYEL&skLds}sPJuyXkCc6C
zO8v{vtQ*roB#uWVm@3bXrTLqUk=YNFGP-K8`FOu&lALWB<>9vgPj&`Kxg_5H(OzLr
zxiV}E#aYs{GJ5V!z!adgW)8?nSEdOXA4uUL$w{{kfOQ+yA_hI_HfV4>)*_-6x1?5X
zE&xER1pJ*ixVIUC1jACdKIAo3yt4l%lo2xz>CU=<e6(N%@8|4j5|u!XvL)TEf=W>{
zkvufo%V58vf^>7YH^+?7?ZcJl;Q_!7%|@)+s@t1^#`?$Qz}nbxZ)Uu%dO35vYI<M^
z4^swfV4vcTxW4znFJ6ow5I_5XS=X9LGFwv6&=oNz(uxu}(w>hccxK$9%2H4}e7Yb-
z?OEsDt7wrLW$L>2lS-Q8Lh<_g&`;vjQjH9`nE+ebihY8?7sU<=BDG@M?Df1#+?M^^
zPo*RWza0rAoDbM}+7Fu`;N?dniT+IMMxn+*CUM=R{Ms=hXyy4EJaCKiHxuyuN!GJT
z%Ui<p`)4HcPY>&&0|==?Q$2k~;`kko%kR6fA0Uk`2_Wn<+sF0+k_CvN^z}*dM}D+%
ze_JyBaze{t^Jcsuku1RnGV01?623KW$P+mh``)~$0Xaqc_fH+wt@uBc$E(!m3%1tl
z<F)Nw<0C=SIna7)^f{r{IqfNdFZ?GZ=dEeLmHR8FZuN1hwejdx(e7B)2EPjABP8&V
zu?+}vpZPAfHZXVk9!$J6D*y>{xx$TK+*k}0xIR6c$PJ0|M1X|4jW<VV+}0ci7}BKa
zPd_O8Q~EM+Ob@Z0?W3TI-Q%%Aqvzt=9@6p`S2ohGHDwt8CpRm}Ad5Q2TE(s1C5*v~
zY=Jk4D}8Gdu3Z~;Y5JbN6WsIH>T9!?)>HscpYQovhjp5Z2xQW2Jx+==5=lzY=qN0i
z_kuYXXxfca66!?r^O05|a}x*KbDLdz@l&L86>C3L!m~Bzy-Uog!Jiji!G%45z<$qD
zt>^%EX@62#^vUI`n6-eY!rg<URubOWgyJrW#o;Lu@K<(yt(J7bb0eIC6$g;l#128@
z>5~Z^s0<d>-$kyy(hd6;&DTL*o^HYl3^S20Wim$_kot@BO|=T(_?^uLR6FfN>mlO)
C?F%9R

diff --git a/vibrator/aidl/default/apex/com.android.hardware.vibrator.pem b/vibrator/aidl/default/apex/com.android.hardware.vibrator.pem
deleted file mode 100644
index c0f5c50e36..0000000000
--- a/vibrator/aidl/default/apex/com.android.hardware.vibrator.pem
+++ /dev/null
@@ -1,51 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-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
------END RSA PRIVATE KEY-----
diff --git a/vibrator/aidl/default/apex/com.android.hardware.vibrator.pk8 b/vibrator/aidl/default/apex/com.android.hardware.vibrator.pk8
deleted file mode 100644
index d20cc33397c6cd9656796eddb06a7363a9bec11e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2376
zcmV-O3Agqzf(b+d0RS)!1_>&LNQU<f0RaI800e>wE--=#Dgprj0)heo0M+xJ?#)D(
zSp!xg=#57Ub<N-2NFNW0Q)<$r-o{pMYGv!{9#z49If$2oR4ir3d!)5>&)CuXQ%ykT
z349(bdWwfldwU6dQX$Pqs&vP|pYD-a!d!2A`X`?Q=^vrC3tCDG{8-}TA)KLZWj8fC
z9PQIy+C3D)9<hChX^;CfM8>B{Hdfcrwjanjc-P?(m;+DZj!=jmrvLHjjz~vdJ0$pg
z9j@TN6Flw5gsm&<-R~}3HI!!5Iv_X2*x4~8k%^+t2m;raZb7=zuKHKXW>~PQBEt-|
z7YL;>2~dXTZxAX<@0_igkfRH|9<oegdaj;XmjNfGyA|D+#Y#C-Ok{kwikSNzIulTu
zA`wu_VdVRDzWS4CLll3>M%n0la6yW71S;{9-m|02o<iVFgGj`T)V8zEL|i9`Wz19y
zTt0t`1)y80p4M5XI7)>jnk92r#B=3e5!PM6nVA=$rJI(o+7RYCtv#r{Hl2L5J0K_s
zj)-!)z?4yFmItNZY1XGydvoJ<`>V?^{mMt36M-nO9Me$2=3%7$My+u2RzISYzEl5b
zsGj)9yf9!oF9FbuBB|ln?pmx%BM!Kv;^kxOC(eWz(tbWzuLJY_Fb1u9ZY0bk_P21`
zR4<*kCgM;Dl@+~<v*%SSiN|rVlUvX(1}MV_;RiwpxL(esp8^8`009Dm0swVEAMi#b
z`awBY;-|`ujulYw2=zm_lMPvP`VetwdxbYRbj6K84*FjPl3n&Y4SA5tHaFwnD7yWU
zyuYLSF>5n2b>Cl&(n);g@s%NsJKrj^6dN_?k8Oy1SbS0Lp+i-NQA|oUhRS&P>+_<o
z6dO3F=gRp&z$R=Zoi-&$iQLO}aO6wz*&Bxqhnd&TEQ3G=Zs&>dAH!^K+YK~Dkh&j7
z<5jIX)ZHmQGh<#jy!w-qx64s_je`-FA7S~PIw@S@5yD6`d30W<k->e((NG8ZLNx5^
zu<&2EkjY04xE7%(T#Gj~*@(R&xY6?KbLm2R+#{;#T&2vE_7Rlb7wx;4ya1LBScI{g
zfRl^xyH*GPds?gtYGhl>+eU2jqusn{BlTJOJoIc2>=Ouz`6{oWxff7ZRW|+M(%6OZ
z;_)8~oVTFV2i0LkFMqb?n}QCVt04E-<{oVLgiY^|l}+>!(eL}fr)4>!bkl94Qdqn>
zdMb2%@y0~>UVu3deeRBbLwykArxYHHU!c?}ks19ZWlFVRc3Q%HQrc6H%qUl;{yp#2
zT$2_9P9>=mtStS-5Mfp}C4CL>J%DdD7$)*$esq_B^kq*!&dVs%L({wzO6KL&=Mw4!
z3RrOPKOuixuG4KQ(|Q%g^(6oY#sH^8wg=X|iKD9df)MjbvJnD;0RaI1Lxt{<crPK*
zqrPhphMGU?x=zB>(tM|UiN?hPWjvcR%J*jUnWJ4v-yRgH9l6`NmJp%Mxjx0^4o#A>
z)7$p(s?Cn(gjIIVOD9W%OD=7xqx<LAy>8qus>(F)aN&o)$o4$HT!N49qPGrkHZBBE
zpV(vQZ3<S!bA!ykJr&feTtLN*{*t#xmT(`utYJ;VofU?~C7!;5siPayo%|}$Fzhe~
ztUkBBA;HD06CS}5hf)$LL`jkxd6Y@!Fbj^9`_mZ?V?;7T4E9<AB!V#mJ!$u^PHp?$
zS(E}8V|5<|s&R#&Ma=AA#nA)_U0F#6=**{qF$8VJX9LQJ=DB$Sf&l>l*J+^G#_B#_
z$I?S4K-4Vu{47$o8ZTP+6xUS~=zxo#DG$e__pVyAgEkHXDOOhpvT_{$`N!yi@mc&w
zCfe16Zth#Li?LOXy%(H7ANU-3e(>R`pm-QexbB94b_cA<vv!=ew^j`DhG}c(NX^Km
zNC_?eI^@pJjylS2cYw!Va7qV*QF^fjkd^f#tuCPyQQx>yPj+;?Y^C@MgXFzh;(n1a
zI1u&K-B$HhH+(yg6L$_wX^rl3jg#Ho<e~wN9aX8xY5u=cu<0C1H~ZmYAvKjdw=uTk
zcRv{X`iyQ*5CvK4AN28UsN|ma@+H;mu2A<iONnmalRS|KD_E)50)hbn0EDxF2Mz59
z%tE=2{2ABgQBE2nSrqa16$7qxiv~uc=IoUfqAD)6P)_Net#HN;=2~g9tbWcLu=M8+
z9d0k2F}c@A2|3OGJkC|};5u2>m2F@oY|ro#7vR|DN77%rl{v=@oR8BSVLH@RZMUk=
zL3u*6kr5F$z$vvXD1-LFnh6C^*vd}-3!v2}7pX+vQ`4{fI3`qx5iRJGG)A$(mL{qp
z+P`LMB|{X4DL=7_?}1nr!CSyY6?r*s=Tf)mkTtnzXFpdLl#}8F0NwRx?PQ;P+QcW$
z#}Kny$LuPcN#KtlNO@^=mN~nGX7cPoSr@(#ajU<DY&8a&x9!tiAp(K{0RWeJx)*lY
z=6>iuo#fh;+5p`cHW|c}Bz?E^Ea}k*1ScwT<V(l6o+G+bTFd5L#@VdQzC$-xGSi*w
zPm-Z(CD-{vILyP9GP^60+}PtHP_xHokm>#8HUdr2zE``bZUb=UDiQl0(f|T6L?z;O
zgK--h33AKpcH2?|S+fx8NJ)O@Fdb4r+ZQympDi_QqU>!R%eiI~z{hw8#zZ2$$-<4F
zzivY$`Wq;TECDkIbHhJO>x(3JAcX<8N5JqjRIi~$N*+%kOI`^41YXp;m87x(!Y#T7
zg}SqHb(#QvoLi8>l9nf4(jW0M!|zNY`zmtski@f>vzE;>JTd5ba|Hr|0RaHC3UtsQ
zZAU)`GjPQXXBB9~EW-~!Ogw4=omk;{Ii-L<ju1Gs+e4jF><!p7*w5l$Ve+rcp4y$Z
z)k6%|&DeDcGG_~?|E9bW)SeOvgc7&SCFjIfQGy35Z&77$Hf!Pg{#UksmTu^KLgE5R
zyItpjCrThs%R%n2K3VJgTy$jSfyxSlF#-%bV%3^;q!)hwY-QeF6Z+Tb+z)kq@1rDy
zn8CA0>LMTV0`U^6&4$hUE2my?+66*k5fc}TrqSZs^Z$e8X-OtAt4fmEB8e<#m|{jy
us>cK@&Jjv#1}rP)kz!KCsS4W?lQugH2D%@)^eYDAVKL4sBu!HGRH_}nRE1ao

diff --git a/vibrator/aidl/default/apex/com.android.hardware.vibrator.x509.pem b/vibrator/aidl/default/apex/com.android.hardware.vibrator.x509.pem
deleted file mode 100644
index 993245b916..0000000000
--- a/vibrator/aidl/default/apex/com.android.hardware.vibrator.x509.pem
+++ /dev/null
@@ -1,34 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIF3zCCA8cCFBJmLB9vGtl8nENMVa8g51Y2vRhPMA0GCSqGSIb3DQEBCwUAMIGq
-MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNTW91
-bnRhaW4gVmlldzEQMA4GA1UECgwHQW5kcm9pZDEQMA4GA1UECwwHQW5kcm9pZDEi
-MCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTEmMCQGA1UEAwwdY29t
-LmFuZHJvaWQuaGFyZHdhcmUudmlicmF0b3IwIBcNMjEwOTE2MTcyOTA5WhgPNDc1
-OTA4MTMxNzI5MDlaMIGqMQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5p
-YTEWMBQGA1UEBwwNTW91bnRhaW4gVmlldzEQMA4GA1UECgwHQW5kcm9pZDEQMA4G
-A1UECwwHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNv
-bTEmMCQGA1UEAwwdY29tLmFuZHJvaWQuaGFyZHdhcmUudmlicmF0b3IwggIiMA0G
-CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDV857uzUSXWQNWIuiNRwt1zd/eSB8P
-iVNq0qTexlZvamXr6h5VwX45iJeDVCxlx3uktXXP2NH7U01A5gl8Hix6iodNe3sJ
-fFIhzUiqdMfAn+6RWcJcb3v6J58D6R+htgtaSgv8WOLkIZyhbmU3NToc7dNe2j0U
-wh6xfYhpj/s0RManSTZW19C2H8g5eNfhEZgDT+KOUIgepv/x6Y5IR147JPh8Ha7g
-vxM87ceErSvr3e8uXDWUZtQ6IDfF2NkxJJGJos4IAteXbkG60q76V8pmWLCqIsMM
-tRcIpTEJUIbnbxAqSu+crZqQowu9HrJMYnqunlmXASeluxXdl8VKOVNMZHy3ipj7
-HjoTUJoiEVDLYeT7db76k2lDFH/JRtnoe3BBinUEKvGT3rOjy55C4E2DSMSM1Laz
-zkRcJ4hlzFQLXD5/iwWgW6me1lmnOEqFJZolc1fEc+VfEdZdwJmZF6Clm5av2hDm
-Oq09qL02nXy0OyAoCI6IcrrAlFFolgel32nWp1R7c+N2+6vLMP3KR50TgSiwHNNQ
-weZhpP1GrXDyVj+ilL5T/2ionvjIvDBgOi8B0IwiqeHY7lqsSyMOuKTi5WPrJ86E
-GNJ+PlivA/P9MAatem4kzCT2t3DbVC+dtybiUAmVFb2Ls+dVK4nHcbGTW9AuBijD
-COEHQgi4Xs6lnwIDAQABMA0GCSqGSIb3DQEBCwUAA4ICAQDGvq99QUxMh+DaI2Pd
-s4fQ9MmYxGDxULhjqgGAjDbL3jQMG2FxPTu1Z2VJgg4n+PTNsgsqgn1JgQM3gvFp
-8FKhoxtzM5V8pPxphCG7U/f3ZsmXdLl69sbVkMRhorhQ8H54q0O/T3Ig/ULZgblE
-xCRT1REB693tUQOCYgWgnsOpvySfujYhNBirl48Hw9zrRmQNTsO20dKwkZUvkVow
-/pawucYrHibgwgKWz8kB3Dl4DODiLybek0hGzr59Joul9eMsxTuQsHAIUv0KO2Ny
-5WT7GIX6qYc+VrnXsO+PHtx5GTUjrJiue3aggoW6X7gu3Z6KuIOiVTVLVp6wSJtt
-VHv90HTu2lYxtPyPSOpFfwFOTicN+5VmLTQwPvPRqsnCaYc+K2iWyEhN/PnSfFNc
-t/TX9HT3ljXq9yfshQmQJ27pdUiYs9Avt7fEXpJjQ0Tn9w8jRS5gsrnTUXTG6HXf
-I4lsMSAApFZa112PwU7xAIIaipBauuMjQCabD/thBzB6d29Rlbz3cjBzoky9h2vb
-XNIVo5O2Jiz7OJQ/7mubvJqIBngiaDK78n2hSdYglI1hgcf0KaQIJUridzmjt0kp
-xXcwIz7nJxhNpbsYnDnqwqz9en8a4N+KeoQleYROo2kEtE434AJkzdABV4IKRafj
-cbPWuY6F2faWAjkSOEhBfGOKOw==
------END CERTIFICATE-----
diff --git a/vibrator/aidl/default/apex/file_contexts b/vibrator/aidl/default/apex/file_contexts
index f811656325..f061caa43c 100644
--- a/vibrator/aidl/default/apex/file_contexts
+++ b/vibrator/aidl/default/apex/file_contexts
@@ -1,3 +1,4 @@
-(/.*)? 							u:object_r:vendor_file:s0
-/bin/hw/android\.hardware\.vibrator-service\.example	u:object_r:hal_vibrator_default_exec:s0
+(/.*)?                                                  u:object_r:vendor_file:s0
+/etc(/.*)?                                              u:object_r:vendor_configs_file:s0
+/bin/hw/android\.hardware\.vibrator-service\.example    u:object_r:hal_vibrator_default_exec:s0