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

8 files changed, 28 insertions, 9 deletions

diff --git a/packages/CtsShim/Android.mk b/packages/CtsShim/Android.mk
index fa6423ecb8c7..b6e322e7069a 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 27289037dd8b..000000000000
--- a/packages/CtsShim/CtsShim.apk
+++ /dev/null
diff --git a/packages/CtsShim/CtsShimPriv.apk b/packages/CtsShim/CtsShimPriv.apk
deleted file mode 100644
index 9a8e75c28b05..000000000000
--- a/packages/CtsShim/CtsShimPriv.apk
+++ /dev/null
diff --git a/packages/CtsShim/apk/arm/CtsShim.apk b/packages/CtsShim/apk/arm/CtsShim.apk
new file mode 100644
index 000000000000..a91160368cb8
--- /dev/null
+++ b/packages/CtsShim/apk/arm/CtsShim.apk
diff --git a/packages/CtsShim/apk/arm/CtsShimPriv.apk b/packages/CtsShim/apk/arm/CtsShimPriv.apk
new file mode 100644
index 000000000000..845d781f38f3
--- /dev/null
+++ b/packages/CtsShim/apk/arm/CtsShimPriv.apk
diff --git a/packages/CtsShim/apk/x86/CtsShim.apk b/packages/CtsShim/apk/x86/CtsShim.apk
new file mode 100644
index 000000000000..a91160368cb8
--- /dev/null
+++ b/packages/CtsShim/apk/x86/CtsShim.apk
diff --git a/packages/CtsShim/apk/x86/CtsShimPriv.apk b/packages/CtsShim/apk/x86/CtsShimPriv.apk
new file mode 100644
index 000000000000..2fc9a94037fa
--- /dev/null
+++ b/packages/CtsShim/apk/x86/CtsShimPriv.apk
diff --git a/packages/CtsShim/build/README b/packages/CtsShim/build/README
index 9869377738b8..59af068f0587 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
+    $ cp $OUT/system/priv-app/CtsShimPrivUpgrade/CtsShimPrivUpgrade.apk \
+        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/apk/arm
+    $ cp $OUT/system/priv-app/CtsShimPriv/CtsShimPriv.apk \
+        frameworks/base/packages/CtsShim/apk/arm
+    $ cp $OUT/system/app/CtsShim/CtsShim.apk \
+        frameworks/base/packages/CtsShim/apk/arm
 
-local testing:
+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 \
-        cts/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp
+        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
+        cts/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/apk/x86
     $ cp $OUT/system/priv-app/CtsShimPriv/CtsShimPriv.apk \
-        frameworks/base/packages/CtsShim
+        frameworks/base/packages/CtsShim/apk/x86
     $ cp $OUT/system/app/CtsShim/CtsShim.apk \
-        frameworks/base/packages/CtsShim
+        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.