From d5583fafa7bf967dfe432731ea0c1636dd3e1246 Mon Sep 17 00:00:00 2001
From: Winston Man <hkman@google.com>
Date: Mon, 16 Oct 2017 10:33:03 +0100
Subject: [PATCH] Update pre-built apks in platform

Now include arm and x86 apks from built server

CtsShim (8.1.0-4396705)

./packages/CtsShim/apk/arm/CtsShim.apk
package: name='com.android.cts.ctsshim'
versionCode='27'
versionName='8.1.0-4396705'
platformBuildVersionName='8.1.0'
sdkVersion:'24'
targetSdkVersion:'24'

./packages/CtsShim/apk/arm/CtsShimPriv.apk
package: name='com.android.cts.priv.ctsshim'
versionCode='27'
versionName='8.1.0-4396705'
platformBuildVersionName='8.1.0'
sdkVersion:'24'
targetSdkVersion:'24'

./packages/CtsShim/apk/x86/CtsShim.apk
package: name='com.android.cts.ctsshim'
versionCode='27'
versionName='8.1.0-4396705'
platformBuildVersionName='8.1.0'
sdkVersion:'24'
targetSdkVersion:'24'

./packages/CtsShim/apk/x86/CtsShimPriv.apk
package: name='com.android.cts.priv.ctsshim'
versionCode='27'
versionName='8.1.0-4396705'
platformBuildVersionName='8.1.0'
sdkVersion:'24'
targetSdkVersion:'24'

Built here:
https://android-build.googleplex.com/builds/branch-dashboard/ub-ctsshim-dev?build_id=4396705

Final OC-MR1 drop for Oct 19th.

This build IS suitable for public release.

Bug: 64504762

Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.PrivilegedUpdateTests
Test: gts-tradefed run commandAndExit gts-dev --module GtsPackageManagerHostTestCases
Change-Id: I9a439f7287a8d3703cf014c7c03df2348a384a80
---
 packages/CtsShim/Android.mk              |   8 ++++--
 packages/CtsShim/CtsShim.apk             | Bin 4807 -> 0 bytes
 packages/CtsShim/CtsShimPriv.apk         | Bin 6044 -> 0 bytes
 packages/CtsShim/apk/arm/CtsShim.apk     | Bin 0 -> 4817 bytes
 packages/CtsShim/apk/arm/CtsShimPriv.apk | Bin 0 -> 9938 bytes
 packages/CtsShim/apk/x86/CtsShim.apk     | Bin 0 -> 4817 bytes
 packages/CtsShim/apk/x86/CtsShimPriv.apk | Bin 0 -> 10205 bytes
 packages/CtsShim/build/README            |  31 +++++++++++++++++------
 8 files changed, 29 insertions(+), 10 deletions(-)
 delete mode 100644 packages/CtsShim/CtsShim.apk
 delete mode 100644 packages/CtsShim/CtsShimPriv.apk
 create mode 100644 packages/CtsShim/apk/arm/CtsShim.apk
 create mode 100644 packages/CtsShim/apk/arm/CtsShimPriv.apk
 create mode 100644 packages/CtsShim/apk/x86/CtsShim.apk
 create mode 100644 packages/CtsShim/apk/x86/CtsShimPriv.apk

diff --git a/packages/CtsShim/Android.mk b/packages/CtsShim/Android.mk
index fa6423ecb8c7f..b6e322e7069a4 100644
--- a/packages/CtsShim/Android.mk
+++ b/packages/CtsShim/Android.mk
@@ -31,7 +31,9 @@ LOCAL_BUILT_MODULE_STEM := package.apk
 LOCAL_CERTIFICATE := PRESIGNED
 LOCAL_DEX_PREOPT := false
 
-LOCAL_SRC_FILES := CtsShimPriv.apk
+my_archs := arm x86
+my_src_arch := $(call get-prebuilt-src-arch, $(my_archs))
+LOCAL_SRC_FILES := apk/$(my_src_arch)/CtsShimPriv.apk
 
 include $(BUILD_PREBUILT)
 
@@ -49,7 +51,9 @@ LOCAL_BUILT_MODULE_STEM := package.apk
 LOCAL_CERTIFICATE := PRESIGNED
 LOCAL_DEX_PREOPT := false
 
-LOCAL_SRC_FILES := CtsShim.apk
+my_archs := arm x86
+my_src_arch := $(call get-prebuilt-src-arch, $(my_archs))
+LOCAL_SRC_FILES := apk/$(my_src_arch)/CtsShim.apk
 
 include $(BUILD_PREBUILT)
 
diff --git a/packages/CtsShim/CtsShim.apk b/packages/CtsShim/CtsShim.apk
deleted file mode 100644
index 27289037dd8bdf5e062c0b20f8657734063b9f52..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4807
zcmeHLXIN8RwoXWZP!ffNCRLQ)5_+#vG$I}82muj<AVmZf5D=sZGL+B+L4+U(f+8KH
z_t2zBSE}?5iiQdII-lNe=DYKEe#|=0I{Tcp%d^)yYrki|TOSPqBLENx1ONb>l_%Z)
z5I6t~P{TTSx;s1Q+F_lqJ9>GG`ntIiI{|>FCTKml0khH|B?6e=o@Qth`QWXls_IpX
z2A$wgz-M}@`Tll{Iwd_lQ){Bf+5j_7)OwS~>QEuN{(Tv$e`j(k3+K!yur}BIRPI1w
z`c9p~om{mGGao>V_Pz`h6b9e@rHZP<1?)p*d8X(%BgC5JwnD-!-vdyZt8|&+?#*JK
z#ptL3BjK`J;jbf3H9LJ)*or^YjV71Vt2s-EP-(spesDplz<rk4Z|>GZ4aHA#=v;5!
z5M4HWidKxActQ02$9rf4RRru@Yzca5D}u@{7Uh=_WZ`dJ$YvjHDMXfbslVf6LyDoR
zI5&DB+$yP?-%D1}Rq;ZkHixCdyA%y^KBcXT1P%{T&8ggKgws0~oL~oyNe^#*ONH(b
zyie_V<{g+%LNO@EL%l^=YDKxgypk8Q8}N*69#0nttMpl`wbF}OE<<*XEim)-dW5aY
z(kH(MaSXEM4NcK(Uebz^dND?2V#ue~ZUjo*?UZ%d<M9eMkal_j-x>{ra_DU)%Sngx
z6nb37WGph7wX!)4`^w~fZhl-?Sr|GOFT9=+jyFj<8jRv&f3ZVOSQyF}TP(3EWj!-w
zgOGXDIUQqRqWwxh-z%<6pU1Qmn=9`pAm1^mpm!{^x{=~p@#1L81V#{SUo_ECVNsly
z?~s`hv>DD%Z$mGCE4Gs8;Yh+;JIXi<i}#uobX{^dM9fE-KE{H2D>)e}nHUdgX<+sy
zjuu8Y4~8SJC1dWqFSWk_vV&{b*)){~Ux<FdFkek62|qrJx>Xoot4FMD=-QAkw)B0t
zmu8!%{VK}m2EkClXde`8pk!M-l|(j@Q%MmcL!CZAJ%Yb^$?DC134ZE%c5K?1_WMmb
z{@HU&pMtAKeDp-~QC%g2GnU@aE__2h=&g(UE3G=wSV9kz#Nj*fuZ^041IwY<zP>VC
z{}6t|u|fM$R<+}jeAkl8<GuDXRpVhrU3oU;MI&yzYeSV^!)TQk;)}HxS5Vu2w?zZn
z262{76`cXvf=e<*KU$!i=ahfMnD)6B6Gm>%vF?32DAKFPnCz$FpG_;T758p_8mhcM
z&}RGcQs6AZ;mQc{8<cZanYjM-FbzL2?LbbXcv}x_YRieO7l=KDtKab3unuV5VfXlI
z-dp~0dvm?~yNW)V60(7fo3H}`0NykJfc{^uQUqze>S`LRiCny*C8n!(<)W6Rk+G<*
zmPmI4bubd};M38yjn^2ucm@kzZ+#)*WG(f1fiO#{evt)g|06_Iz~*s+z}M5STA1uC
z@=YErz=F7>gUuT}KE%!_%&p%w6BLTJmr8XAODt0@k#=`WX0H+epUx?y15z`{Sa^O@
zQLr}Bc*1wq#ur_a*xNv6?ET1mXk%ag;Oo|o5?{gc&|Zl((^YPXr%t=xLJ_PC0+Z1z
zoF~q4tMkOCk*1C(>0di{`gi9vG!2bKjkK%@9k5^|g1pZ^o~VJV!i)2}z?npNV`fwV
z*4c<cbrgA9@ttt&MD5(v#ExQICthAC22^y(Kqq)NjH2O;5lex3bFyge=)E%E%TIto
zGTEayEPc5QZA?caa&&Ac)j-p1V<xwr%vKJsIi?i}DhO9F&kpf+^tSM<%8fAYIWeM-
zPLD=vGsL2*167TWJePF)2TNc;FgC#}xUNIbWnz2v7#i$zR*5lY4a=A064uRGn$*)R
zf*$76wf**~*>9<}^S;AT>2XE?*-0ee)r^F0lAnkFZzSmcDH4W8Y7#f>$6H(ThZg$x
zpW@=4I;+9QJwtfkwOo#l4*O0~<C;$8#u1(0Eqpn;kd|Ts5*kgDYBtO)SyG6+VW08(
zK}tkiL`1xu=TxfyY9{kW$gUcLcq!SQ)D_g6^o#=r=4c1MP7RetNS_9K$Udx0hkJ<+
zZbxm4!=Wv-7gU2+8*A#mzVPFTNb#e#OUa)PBcr&_<soY4(^iv^{k<EJ43P<gNT^@v
zPzA12T+u>(x)5FgN*G2HdZnJg7o}b!k>aJ2NJ(jFR22Q9l(ZC5M)Hv-Wx<;?W`-vq
zW@c2kZgdT;ss}8WS4%7GW;~DiI{U2Y$HRT!fsiyA<F!@7LQRtYZsseemMA45!gbrC
zc1uE;;v&m5mY9+ockDivSnM4@Y#df_Y>N+!5>=r&I^_2c-6iT$SPH>PWH)vM{x<q)
z-^AeUT1bm}JwfA0c=>4m>4wVf!=wpJNPID`ty#cf%*Y~uX9@uGc}@u(Y?*c}Iisy?
zDLwy~u%IVGla%umpX%8(_GD0S(n?Q7b4k^vXs`_uade!_+Pi7xQJLs<un9|qTs+m<
z^HQLZc(l<Yn{Tl0adh*pDa0Mq9x<6WdPmvwloX@l-;`GF5o=|fzKLgMnt5jxtLxfD
z{^-uOU`-0tlyG#K%B&^WH}GzKYbotFKep+VK#7ZCzhn9i2UQuFt4i+++Y57Z#L?Ql
zTb9SJfXB^n2|7ie6o<~;=<}sNU)(+5+xN`F7Gx?#!|EjBoUW{6qz*TXnFac3CWj6^
zNQv80u^?h7UPQj!8@y{n$>!kzO{lnabMJ2JQc)@Y-h6fx%x&u`J>8GM6*dW{4@91-
z>5p=eo(S<w4nlQxOsHLEZUOAkK~|L;&B}21BwyC^nR1lbCVB~)=w?@*Ibq<LjJF)y
zFUGtSo{bE&9MP2H0k;v6C<hY*&lS|YoaYP&UY$}OS18Q&t^}kB)*e2qE6i!1#B3X0
zEcXt?2V#ijk_{Go5AV1`XW8CZr(Kt0;6T)KI(Qu|Ew&2wQf}b3R$qzH6&Gyd-rgo=
zH`^p6EzXXAzvXVss@>xhI4KhuYo#}T!~OKV;q-~qx4wioRL?&ubx;(;d1w|E;aub;
zD#x4p8qFQWXlBLEq6!||s-v}S;%)VMFYHNe_L@af^h^#a(lm@4SBsa+co7lziF#VT
zB!bLd-qDuZ#@`B2BYJoE;Dh7k{)OH}v~xyc!~wq*pJJLo?@snuZt<4^i`3L*!!k}E
z;|+RuxjluIs`Hr3jk(Qor?BDvgqmZN|5{s*lYf-Zx!7&nE`<!=CeN1c!IIQOH}kv%
z9DC;kf2oa6Xulq=T1wb!1Xq|=oX=3Qj~RQj_>O9D7bX_ix7jy%cP%0^yO+M7{)M*F
zk1?N~WtZ2Pj-#ygM+NiWM?9vciP;Nl>0Xpm5<9rek+S{@rCICw{i2M>m&?!c`z;kh
z2<F4afwq>Z85?Fw7^TeH#hk~x*}nBVDS6F&N>EY7)@nbQ=ku}itl;OBgw@ODrIOg;
z2{BC;^8p?bf>T1uvu<CF00RJ36eL8aB*7I)kUz^akElHONzdm=x<qOtOseB2DF_Gv
zaFNQUko7O1ruf9Io!Em|!vX<ahkIzwO4!`}g@7?;c%RE_QlCPSB7?zrWH9K-GY}b&
zjEo8pk1edD+y+h~p%hetVLD+4P#}<;9Doc;K+zznC_pA)3OJdG5ekl^J9&Y?sWt3e
zov*ulVx8?!j7Y?ZkrEEob-#`EwsXdEnL0b(L7hgzPVCfh%AdR6e^_Y#$pZRi;YM=(
zF$XFjBi!zPch0ImOHquw8<K+wij+l)i_0NV5)zWq7EDkH66&F3e!l*vPCFRL^?QJU
z<N#1G5K8(OKnPhd5C|BKX8}*O(wr|@YqOvEILf1}+~c~!{`r_98oyM7@3}eXi_N3X
zb6tQ{pGuK3KmMqECtqW6NeS&xF-OcETrl1G?1X2nFGZI5Hi9+kE_*UpXziV42-}p+
zx)RY?CmR@3*Bjf}G{!ND>{yQP%WImrw4=`r)rU}u&pf~}t-Fv*m@nietO~!`e)ufs
zdi&jkQ3Vv0ypxQmm;?QLteg6l8S^v|6x2=o;lh~fWK+d?GZr1-8y*L^Uj0;Z2mc+N
z@jWLOV`z|Zdvzye<!5aZ3A*N+sR!;;tKBiqi|yHcF}}Q92`VX`{)%9tX9|1DbXt+@
zvr?wO=j@g)#4ns=K+yA`@5rF9NOn@<u*1NNV1$l2z*LD(SgVLGj6BDirI4yKnhqJ%
zaZ-N{9Mpges(bJ++hhf$<^<vXLo*@xw-rZw;tCv0jsyXL$G@isY5kGX0|>ZVoD{vH
z->gP%z}z=hPz<z;^s(T}W5{lNtH+ICI36Q_s4VJpL=Gq+o~~TZ^G(>vA~2v%KvNik
zZVY&r6;SxJj#-%NN{JEOuF2^6cc$ZW6WpqCBDcec;fd@(Jh80ELj9VN^`Rt+{5-c-
zwDf0TL7T4$!|WqSm${DpMAqjGV(cu4$yUxY_G2Q4eET5ci)#wP#?adPz;x-V(o}Vi
z2Bv94#qpM%pt~1mHgaie1HG97?&`59Y3y=SdS1s~)(!boYY_&yzoRFzdiJwsr>oFw
z#)S~f1O0(!<a%DC3){s(A8NCLz%#+!@liS`S&j3xVBj};MtS|Kup7E0SOd_K@C`!J
z6PyE(lo7=!>v+w?^lGV$T7{H)($QC4CJ(<-=<2<TS#R5G%AThWC)B*lD9MV0g;H@&
zsN}-{)~mSj+dmd#>y;F{9+@9Qgu0lG>YuRqv0g1XRgvEqB(ytZcxs@LiMMAPE|+eD
zfuyMvgtDfbzLkTw3uS&(*>6&w=Io^MLtBt4DgWt;<a&=v(RMnjD6v!6Yx_#UjF9=v
zpv$eiaZuMqN!y{-?bf7XO<Z}`E6vN(_;_X!3AgW5x|^uaWEUM7$>z&(15+!V)2F-;
ztByyf(M`7RuP7X7y}A}9&vf<*yW~~{8pwZY5p2jex7Rn@J!`9Ox!3Z{+sMnU4lF3@
zXsC9c6ax}${1;CC4V?Vr|EZ>r<}z}2;!<~Y$K2$S6xT-s$q;~F$2GrG#FOKi|0{oS
zc=P8$ey3t5Z1R`nlGx|J;+B6N;dcsiLfL*v2x(4#jPR4d{kiw=8;28`^GhC+|G77b
W^ys6>NjnSx$y?Gz%BNTV)93F}{o9uS

diff --git a/packages/CtsShim/CtsShimPriv.apk b/packages/CtsShim/CtsShimPriv.apk
deleted file mode 100644
index 9a8e75c28b059af97a1e3538f2f594c97451f5df..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6044
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
JisAg(`!DbOW7q%y

diff --git a/packages/CtsShim/apk/arm/CtsShim.apk b/packages/CtsShim/apk/arm/CtsShim.apk
new file mode 100644
index 0000000000000000000000000000000000000000..a91160368cb8249aba90770620b0595c283ec065
GIT binary patch
literal 4817
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

literal 0
HcmV?d00001

diff --git a/packages/CtsShim/apk/arm/CtsShimPriv.apk b/packages/CtsShim/apk/arm/CtsShimPriv.apk
new file mode 100644
index 0000000000000000000000000000000000000000..845d781f38f318b1eca7221d754aa549bdc2a681
GIT binary patch
literal 9938
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

literal 0
HcmV?d00001

diff --git a/packages/CtsShim/apk/x86/CtsShim.apk b/packages/CtsShim/apk/x86/CtsShim.apk
new file mode 100644
index 0000000000000000000000000000000000000000..a91160368cb8249aba90770620b0595c283ec065
GIT binary patch
literal 4817
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

literal 0
HcmV?d00001

diff --git a/packages/CtsShim/apk/x86/CtsShimPriv.apk b/packages/CtsShim/apk/x86/CtsShimPriv.apk
new file mode 100644
index 0000000000000000000000000000000000000000..2fc9a94037fa1a5b5879eeee236f292204bc82b7
GIT binary patch
literal 10205
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

literal 0
HcmV?d00001

diff --git a/packages/CtsShim/build/README b/packages/CtsShim/build/README
index 9869377738b80..59af068f05871 100644
--- a/packages/CtsShim/build/README
+++ b/packages/CtsShim/build/README
@@ -6,19 +6,34 @@ must specify the singular APK that can be used to upgrade it.
 NOTE: The need to include a binary on the system image may be deprecated if a
 solution involving a temporarily writable /system partition is implemented.
 
-build:
-    $ tapas CtsShim CtsShimPriv CtsShimPrivUpgrade CtsShimPrivUpgradeWrongSHA
+For local testing, build the apk and put them in the following folders.
+This is for arm:
+    $ tapas CtsShim CtsShimPriv CtsShimPrivUpgrade CtsShimPrivUpgradeWrongSHA arm64
     $ m
-
-local testing:
     $ cp $OUT/system/priv-app/CtsShimPrivUpgrade/CtsShimPrivUpgrade.apk \
-        cts/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp
+        cts/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/apk/arm
+    $ cp $OUT/system/priv-app/CtsShimPrivUpgrade/CtsShimPrivUpgrade.apk \
+        vendor/xts/gts-tests/hostsidetests/packagemanager/app/apk/arm/GtsShimPrivUpgrade.apk
     $ cp $OUT/system/priv-app/CtsShimPrivUpgradeWrongSHA/CtsShimPrivUpgradeWrongSHA.apk \
-        cts/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp
+        cts/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/apk/arm
     $ cp $OUT/system/priv-app/CtsShimPriv/CtsShimPriv.apk \
-        frameworks/base/packages/CtsShim
+        frameworks/base/packages/CtsShim/apk/arm
     $ cp $OUT/system/app/CtsShim/CtsShim.apk \
-        frameworks/base/packages/CtsShim
+        frameworks/base/packages/CtsShim/apk/arm
+
+This is for x86:
+    $ tapas CtsShim CtsShimPriv CtsShimPrivUpgrade CtsShimPrivUpgradeWrongSHA x86_64
+    $ m
+    $ cp $OUT/system/priv-app/CtsShimPrivUpgrade/CtsShimPrivUpgrade.apk \
+        cts/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/apk/x86
+    $ cp $OUT/system/priv-app/CtsShimPrivUpgrade/CtsShimPrivUpgrade.apk \
+        vendor/xts/gts-tests/hostsidetests/packagemanager/app/apk/x86/GtsShimPrivUpgrade.apk
+    $ cp $OUT/system/priv-app/CtsShimPrivUpgradeWrongSHA/CtsShimPrivUpgradeWrongSHA.apk \
+        cts/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/apk/x86
+    $ cp $OUT/system/priv-app/CtsShimPriv/CtsShimPriv.apk \
+        frameworks/base/packages/CtsShim/apk/x86
+    $ cp $OUT/system/app/CtsShim/CtsShim.apk \
+        frameworks/base/packages/CtsShim/apk/x86
 
 For final submission, the APKs should be downloaded from the build server, then
 submitted to the cts/ and frameworks/base/ repos.