From 2284f7e4eac56d713e3c58a86e5a828a76df4bd6 Mon Sep 17 00:00:00 2001 From: Baligh Uddin Date: Sat, 31 Oct 2020 20:51:56 +0000 Subject: [PATCH] Migrate frameworks/base/apex/extservices to packages/Modules/ExtServices/apex BUG: 167960011 Test: TH Merged-In: I6f6df644221cf7fafb09485f2cec937fd33b69cb Change-Id: I654ba2791a1c8a782c04409ae756a6be335e0306 --- apex/extservices/Android.bp | 39 -------------- apex/extservices/apex_manifest.json | 4 -- .../com.android.extservices.avbpubkey | Bin 1032 -> 0 bytes apex/extservices/com.android.extservices.pem | 51 ------------------ apex/extservices/com.android.extservices.pk8 | Bin 2376 -> 0 bytes .../com.android.extservices.x509.pem | 36 ------------- apex/extservices/testing/Android.bp | 25 --------- apex/extservices/testing/test_manifest.json | 4 -- 8 files changed, 159 deletions(-) delete mode 100644 apex/extservices/Android.bp delete mode 100644 apex/extservices/apex_manifest.json delete mode 100644 apex/extservices/com.android.extservices.avbpubkey delete mode 100644 apex/extservices/com.android.extservices.pem delete mode 100644 apex/extservices/com.android.extservices.pk8 delete mode 100644 apex/extservices/com.android.extservices.x509.pem delete mode 100644 apex/extservices/testing/Android.bp delete mode 100644 apex/extservices/testing/test_manifest.json diff --git a/apex/extservices/Android.bp b/apex/extservices/Android.bp deleted file mode 100644 index 0c6c4c23dce14..0000000000000 --- a/apex/extservices/Android.bp +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright (C) 2020 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -apex { - name: "com.android.extservices", - defaults: ["com.android.extservices-defaults"], - manifest: "apex_manifest.json", -} - -apex_defaults { - name: "com.android.extservices-defaults", - updatable: true, - min_sdk_version: "current", - key: "com.android.extservices.key", - certificate: ":com.android.extservices.certificate", - apps: ["ExtServices"], -} - -apex_key { - name: "com.android.extservices.key", - public_key: "com.android.extservices.avbpubkey", - private_key: "com.android.extservices.pem", -} - -android_app_certificate { - name: "com.android.extservices.certificate", - certificate: "com.android.extservices", -} diff --git a/apex/extservices/apex_manifest.json b/apex/extservices/apex_manifest.json deleted file mode 100644 index b4acf1283d3e0..0000000000000 --- a/apex/extservices/apex_manifest.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "com.android.extservices", - "version": 300000000 -} diff --git a/apex/extservices/com.android.extservices.avbpubkey b/apex/extservices/com.android.extservices.avbpubkey deleted file mode 100644 index f37d3e4a14d4a2d322796ec23e2cd811f256820a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1032 zcmV+j1o!&@01yD>;mP^Aiy>4vk&@l*m>6ntX$m@SMsoOyq_)RM`dC0Q#t#IvcB+d? zpdHunU{ChdR@Ec{$b|xv=U#t$S`%0cDrvVMxfF1*Gi`1JA*Q1bw^{1u5AU$$)Fj~p z_BhkXq;HDM<$;&fq6X)9N|T2VD)c8O0kXBy^VH>^*#NOH?hHX+T))Zj#s5ok6v7kL z(vT&ALI-p@bPQo*Wuj#fkXiV7h?=;9`~?kA#arfA+jBL}5tGHx4}K>$EOHmuQyKi8 z?M>|yc^Ee8`N(X~9Yrx%ZWTygx=9`3(#=RYbUQ?4QgHqY{BzbRL(D~4hI1`4d{Xv; zd~6TLQBxnVS=vFk2AK^4a}jZ!_Snc}#v4)oZ_B_jHBgJ1*<5X@`B(=a0+p?asS!12 zMEEE&s&(+IhPIwk4tOHhakpSh((WN!srDi2CAJ&h_?$n(t49)wx4b%7-SqJqFe4d= z{!dI&Y0z)xw+_)djG3y$jOw-bT~z2}mqC~l9JL~Rt^mx7MoqmD{;sdY=j2oCBLF9` z!))Sn26Q(diUyy>Mor83l>>7-xgaUYe; ze$$6E-B-5^0kS`qkTcpt$)TiW1)5OT1Zldx@tHJc?Ee?MEe!J9_W)uG(?DA964r?6 z`>phY=7?pH4P3Ha_wOu0O-krz)$@Z1RKUBWfTVN(7K=y!)g}tX)^v*#Qs7QE$HSkM z+%EkmPryz*Q6?UF%B-s*iW-_-dS2DS-rw*dr(srtBq3LZ0U?J{nQn1 z14MN<3&Q5Wj?SeA!KJ@jvC~(LJW>~AvZ_e5KCk}W*xL8n`X+`6tZOGEg_}IY zVmuom;$Bxef%^CQ;*Q@PFZ;@O^84Jj$%z=R^)D~|iV0=|s*YCl_zRj7xK#D}-z##+ zY`P+n>%d`8-VJ`;>ynz9HkT>FSSsz;6_S2#6>H`y*pFc=f0J<8@SRe~!;S8ewieDx C>ILNh diff --git a/apex/extservices/com.android.extservices.pem b/apex/extservices/com.android.extservices.pem deleted file mode 100644 index 7bfbd34ff9b9c..0000000000000 --- a/apex/extservices/com.android.extservices.pem +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -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 ------END RSA PRIVATE KEY----- diff --git a/apex/extservices/com.android.extservices.pk8 b/apex/extservices/com.android.extservices.pk8 deleted file mode 100644 index 59585a212592980b43c399267e9c54354ad29b56..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2376 zcmV-O3Agqzf(b+d0RS)!1_>&LNQUwE--=#Dgprj0)heo0MeRC;>KuH zQMbPRybDu&ZSC2l8LeZ1$wnOSB@IQ{iK%Q<e!j7);+xTf8O>(+9LBGyvvF5 z^&uGF2sEWe^Sq-|UYRjlA+;P$g4;CT&fvo?kjQ^)tXnDV*8UwtxYBwQOOy3tO-47rz4i;q z#L$rbHRL8t#5?SZRVCqz8!vaK6VGeNV-uxTPof7Q|9*oTl(KtoG9e-@HB7gv>IE0iIdfLc} z3J>D~(TI^wvw{7o3?LWrB1{&g{R$tLKiovj7HSS5O|UIFPwS*@Frjk{A$=fs<98eU!d^cRy7b zSP6@;o5hJ~r@RDD3c;D3CJ!>sCmXCeTe=T012zDk#v@KDSO* zV`3tZ*U)=El@?ig>}IJY7~}Jhxb!>}XdWwwb^5K@@^+5z%uBtBpRa=P-seW99NeH> z6#XHytJ30;m{W2-p9^$oWiwC0ajh0KcIGPe;N4aZ1}JjM4KuXM0%)hk5!%jVT-osxg*8sq1r&LE7hj zbR(sbrN_jLG@Ej25szdM{6tKIId@Y{v}_JjlDx`w%|yO3eJOz=6hTW`HQ{qw$BsDO zwsWTSha~gzcld>K&?-Z6jcsdDONca~8-wK=Zk#F;SN`9Jsu95gf&l>l^~GWpA(ijy zEsJVpHFe#mTFbBM769#}HsX+#>m4Pm&T{MGyhxUB4Faj&ZP4mPF`Sw#EI5^tpT_2n zrS9(`xA?DPcMhElslp@tK$0G4TJ3unL2#5n6T)(4QA@B11BA=c!m(TD_jMZ()BObh z)1|ZgCbEokWgmswSR`|M%ZL-zxd*~25&li z?(%>W!?DRju^Ov`8tYCNY>Pm}SX;l#DWqf`z=L!F}QysE|cyGM2DJ*XA- zAQ9JE8PHiHo+(yY*CxVE%@B~mlcOm?=0Ay}!r;NsY-NtM*6)fyS3~YlKPDTjDWa6Y zpY$jD1>Y%V#Ta67R$9Fi=fBL*wC=PJ$z8%;QfxieP=-o+UrTeDz{DECdU8-5QA{RSK(uD&V`|404wugi0`VbK(sN{1NH zVooIFV3n0bp!1*~8I=e|9Su=wpFM0QQxo!!L$tPrB1B2-^z!>=Ndkfa0RYT!=;{*+ z8jOBkUY^<=wa6sv66SJmOFuHWy!AMv0$2f4?~JH==}2!@E8p)Cz7E*>AN6L#n+RbD zpLs#%!`&31HKkL)Ks)SerfiFP0QqIf?tgmFA3{DYo#ZC;0{1+M7Sgv#x!w3C-QeA} zx0UCG3wKcIZIl2g#v3YKXcj0efC1JYI*(mSDg3CsPxw}>&8UlV4b@>4SXLM^{KbFt zzJ7Lg8oX91Y4&+IYCE9>Nt${z zi+z4d(2V9)&nNV{oM+s@qoBGU#ulQnOog4J6DX9q4?pS9#|hf>7w%cwQe~jK?<`OJ zSoF(>!a(3+lrzS|cfo7BjL>e6^1kDwBrK9b>Y-I@K2iYK`7d6C{7(PXV^EO-f&l9g;gYgI$Sg(+iTu9M7k-@; zFU??~y2l|mM_v#xG#;zVZOEHn4Y$WffQ@jLZ4DWK_~aNjspYBvW|mPD#lSS1HNf>T zYX?b{y+DQ~{p%P6`vUb1gd=gk11IeNK0y1O^z;-AP`sg|R6GQ`l(piv7E%fo8BY