commit 8852f980a3369e201ce4af8057fd5c6def670e2e
author Ivan Chiang <chiangi@google.com> Fri Apr 24 18:14:19 2020 +0800
committer Ivan Chiang <chiangi@google.com> Fri Apr 24 21:13:56 2020 +0800
tree cc991ae3e3c5182b76ffb80c29f8f7f17ab10d0e
parent f26a0c2541402aafad152b5d018c4413d463eb5b

Update prebuilt CTS shim pkgs with the ones built on server

cts/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/apk/arm/CtsShimPrivUpgrade.apk
package: name='com.android.cts.priv.ctsshim'
versionCode='29'
versionName='R-6425162'
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'R'
targetSdkVersion:'28'

cts/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/apk/arm/CtsShimPrivUpgradeWrongSHA.apk
package: name='com.android.cts.priv.ctsshim'
versionCode='29'
versionName='WrongSHA'
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'R'
targetSdkVersion:'28'

cts/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/apk/x86/CtsShimPrivUpgrade.apk
package: name='com.android.cts.priv.ctsshim'
versionCode='29'
versionName='R-6425162'
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'R'
targetSdkVersion:'28'

cts/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/apk/x86/CtsShimPrivUpgradeWrongSHA.apk
package: name='com.android.cts.priv.ctsshim'
versionCode='29'
versionName='WrongSHA'
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'R'
targetSdkVersion:'28'

cts/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v1.apex
package: name='com.android.apex.cts.shim'
versionCode='1'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

cts/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

cts/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_additional_file.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

cts/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_additional_folder.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

cts/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_different_certificate.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

cts/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_different_package_name.apex
package: name='com.android.apex.cts.shim.different'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

cts/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_no_hashtree.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

cts/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_sdk_target_p.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'P'

cts/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_signed_bob.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

cts/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_signed_bob_rot.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

cts/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

cts/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_with_post_install_hook.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

cts/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_with_pre_install_hook.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

cts/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_wrong_sha.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

cts/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v3.apex
package: name='com.android.apex.cts.shim'
versionCode='3'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

cts/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v3_signed_bob.apex
package: name='com.android.apex.cts.shim'
versionCode='3'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

cts/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v3_signed_bob_rot.apex
package: name='com.android.apex.cts.shim'
versionCode='3'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

cts/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v1.apex
package: name='com.android.apex.cts.shim'
versionCode='1'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

cts/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

cts/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_additional_file.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

cts/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_additional_folder.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

cts/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_different_certificate.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

cts/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_different_package_name.apex
package: name='com.android.apex.cts.shim.different'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

cts/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_no_hashtree.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

cts/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_sdk_target_p.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'P'

cts/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_signed_bob.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

cts/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_signed_bob_rot.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

cts/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

cts/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_with_post_install_hook.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

cts/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_with_pre_install_hook.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

cts/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_wrong_sha.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

cts/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v3.apex
package: name='com.android.apex.cts.shim'
versionCode='3'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

cts/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v3_signed_bob.apex
package: name='com.android.apex.cts.shim'
versionCode='3'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

cts/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v3_signed_bob_rot.apex
package: name='com.android.apex.cts.shim'
versionCode='3'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

cts/hostsidetests/stagedinstall/testdata/apk/CtsShimTargetPSdk/arm/CtsShimTargetPSdk.apk
package: name='com.android.cts.ctsshim'
versionCode='29'
versionName='R-6425162'
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'R'
targetSdkVersion:'P.123'

cts/hostsidetests/stagedinstall/testdata/apk/CtsShimTargetPSdk/x86/CtsShimTargetPSdk.apk
package: name='com.android.cts.ctsshim'
versionCode='29'
versionName='R-6425162'
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'R'
targetSdkVersion:'P.123'

Built here:
https://android-build.googleplex.com/builds/submitted/6425162/CtsShim_x86_64/latest
https://android-build.googleplex.com/builds/submitted/6425162/CtsApexShim_arm64/latest
https://android-build.googleplex.com/builds/submitted/6425162/CtsApexShim_x86_64/latest
https://android-build.googleplex.com/builds/submitted/6425162/CtsShim_arm64/latest

This build is suitable for public release.

Test: presubmit
Bug: 154025817
Change-Id: I9c6c593b96400e5ff432a4d869ac2c11bcbaedc3

hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/apk/arm/CtsShimPrivUpgrade.apk

diff --git a/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/apk/arm/CtsShimPrivUpgrade.apk b/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/apk/arm/CtsShimPrivUpgrade.apk
index ff3fa20..543f310 100644
--- a/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/apk/arm/CtsShimPrivUpgrade.apk
+++ b/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/apk/arm/CtsShimPrivUpgrade.apk
Binary files differ

hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/apk/x86/CtsShimPrivUpgrade.apk

diff --git a/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/apk/x86/CtsShimPrivUpgrade.apk b/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/apk/x86/CtsShimPrivUpgrade.apk
index 405a73d..c801897 100644
--- a/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/apk/x86/CtsShimPrivUpgrade.apk
+++ b/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/apk/x86/CtsShimPrivUpgrade.apk
Binary files differ

hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v1.apex

diff --git a/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v1.apex b/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v1.apex
index 001ca37..0a77a65 100644
--- a/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v1.apex
+++ b/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v1.apex
Binary files differ

hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2.apex

diff --git a/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2.apex b/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2.apex
index a2d0b9d..30f0e61 100644
--- a/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2.apex
+++ b/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2.apex
Binary files differ

hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_additional_file.apex

diff --git a/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_additional_file.apex b/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_additional_file.apex
index 8d3a2fe..cdbd503 100644
--- a/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_additional_file.apex
+++ b/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_additional_file.apex
Binary files differ

hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_additional_folder.apex

diff --git a/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_additional_folder.apex b/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_additional_folder.apex
index 2286fb2..b4a2d37 100644
--- a/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_additional_folder.apex
+++ b/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_additional_folder.apex
Binary files differ

hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_different_certificate.apex

diff --git a/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_different_certificate.apex b/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_different_certificate.apex
index f2d8818..5970eb9 100644
--- a/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_different_certificate.apex
+++ b/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_different_certificate.apex
Binary files differ

hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_different_package_name.apex

diff --git a/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_different_package_name.apex b/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_different_package_name.apex
new file mode 100644
index 0000000..8300cd7
--- /dev/null
+++ b/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_different_package_name.apex
Binary files differ

hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_no_hashtree.apex

diff --git a/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_no_hashtree.apex b/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_no_hashtree.apex
index 2b18645..99c1d2e 100644
--- a/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_no_hashtree.apex
+++ b/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_no_hashtree.apex
Binary files differ

hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_sdk_target_p.apex

diff --git a/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_sdk_target_p.apex b/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_sdk_target_p.apex
index dae059e..7c147ad 100644
--- a/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_sdk_target_p.apex
+++ b/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_sdk_target_p.apex
Binary files differ

hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_signed_bob.apex

diff --git a/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_signed_bob.apex b/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_signed_bob.apex
index e67fcc4b..3b0e8c3 100644
--- a/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_signed_bob.apex
+++ b/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_signed_bob.apex
Binary files differ

hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_signed_bob_rot.apex

diff --git a/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_signed_bob_rot.apex b/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_signed_bob_rot.apex
index 43a82d6..45480c1 100644
--- a/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_signed_bob_rot.apex
+++ b/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_signed_bob_rot.apex
Binary files differ

hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex

diff --git a/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex b/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex
index 01f6943..e8bf987 100644
--- a/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex
+++ b/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex
Binary files differ

hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_with_post_install_hook.apex

diff --git a/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_with_post_install_hook.apex b/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_with_post_install_hook.apex
index b02691a..8b20f9d 100644
--- a/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_with_post_install_hook.apex
+++ b/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_with_post_install_hook.apex
Binary files differ

hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_with_pre_install_hook.apex

diff --git a/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_with_pre_install_hook.apex b/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_with_pre_install_hook.apex
index 62bca28..454002d 100644
--- a/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_with_pre_install_hook.apex
+++ b/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_with_pre_install_hook.apex
Binary files differ

hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_wrong_sha.apex

diff --git a/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_wrong_sha.apex b/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_wrong_sha.apex
index 64e5606..8e64b73 100644
--- a/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_wrong_sha.apex
+++ b/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v2_wrong_sha.apex
Binary files differ

hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v3.apex

diff --git a/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v3.apex b/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v3.apex
index 7543601..acf3be2 100644
--- a/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v3.apex
+++ b/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v3.apex
Binary files differ

hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v3_signed_bob.apex

diff --git a/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v3_signed_bob.apex b/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v3_signed_bob.apex
index 973b12f..b7a2d02 100644
--- a/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v3_signed_bob.apex
+++ b/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v3_signed_bob.apex
Binary files differ

hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v3_signed_bob_rot.apex

diff --git a/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v3_signed_bob_rot.apex b/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v3_signed_bob_rot.apex
index f2241c3..07e3977 100644
--- a/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v3_signed_bob_rot.apex
+++ b/hostsidetests/stagedinstall/testdata/apex/arm/com.android.apex.cts.shim.v3_signed_bob_rot.apex
Binary files differ

hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v1.apex

diff --git a/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v1.apex b/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v1.apex
index 1357ffd..0a6ec9b 100644
--- a/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v1.apex
+++ b/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v1.apex
Binary files differ

hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2.apex

diff --git a/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2.apex b/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2.apex
index 7b838b0..c9555a4 100644
--- a/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2.apex
+++ b/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2.apex
Binary files differ

hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_additional_file.apex

diff --git a/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_additional_file.apex b/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_additional_file.apex
index 1ecac7e..c6f6730 100644
--- a/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_additional_file.apex
+++ b/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_additional_file.apex
Binary files differ

hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_additional_folder.apex

diff --git a/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_additional_folder.apex b/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_additional_folder.apex
index 578a640..cb40709 100644
--- a/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_additional_folder.apex
+++ b/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_additional_folder.apex
Binary files differ

hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_different_certificate.apex

diff --git a/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_different_certificate.apex b/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_different_certificate.apex
index 22e4803..061f00d 100644
--- a/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_different_certificate.apex
+++ b/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_different_certificate.apex
Binary files differ

hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_different_package_name.apex

diff --git a/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_different_package_name.apex b/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_different_package_name.apex
new file mode 100644
index 0000000..89d687d
--- /dev/null
+++ b/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_different_package_name.apex
Binary files differ

hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_no_hashtree.apex

diff --git a/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_no_hashtree.apex b/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_no_hashtree.apex
index 53b74d4..c505cab 100644
--- a/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_no_hashtree.apex
+++ b/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_no_hashtree.apex
Binary files differ

hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_sdk_target_p.apex

diff --git a/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_sdk_target_p.apex b/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_sdk_target_p.apex
index 72e0559..961021f 100644
--- a/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_sdk_target_p.apex
+++ b/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_sdk_target_p.apex
Binary files differ

hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_signed_bob.apex

diff --git a/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_signed_bob.apex b/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_signed_bob.apex
index ae42acc..482d3d8 100644
--- a/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_signed_bob.apex
+++ b/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_signed_bob.apex
Binary files differ

hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_signed_bob_rot.apex

diff --git a/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_signed_bob_rot.apex b/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_signed_bob_rot.apex
index 7b8096b..c461d9f 100644
--- a/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_signed_bob_rot.apex
+++ b/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_signed_bob_rot.apex
Binary files differ

hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex

diff --git a/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex b/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex
index b4d2fbf..cfdc9f0 100644
--- a/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex
+++ b/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex
Binary files differ

hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_with_post_install_hook.apex

diff --git a/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_with_post_install_hook.apex b/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_with_post_install_hook.apex
index ba47c75..9f22e23 100644
--- a/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_with_post_install_hook.apex
+++ b/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_with_post_install_hook.apex
Binary files differ

hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_with_pre_install_hook.apex

diff --git a/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_with_pre_install_hook.apex b/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_with_pre_install_hook.apex
index 494ca23..6300caf 100644
--- a/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_with_pre_install_hook.apex
+++ b/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_with_pre_install_hook.apex
Binary files differ

hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_wrong_sha.apex

diff --git a/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_wrong_sha.apex b/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_wrong_sha.apex
index 1c394e5..02dec8a 100644
--- a/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_wrong_sha.apex
+++ b/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v2_wrong_sha.apex
Binary files differ

hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v3.apex

diff --git a/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v3.apex b/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v3.apex
index bfea3f6..030e57d 100644
--- a/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v3.apex
+++ b/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v3.apex
Binary files differ

hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v3_signed_bob.apex

diff --git a/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v3_signed_bob.apex b/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v3_signed_bob.apex
index 0310d7e..3957085 100644
--- a/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v3_signed_bob.apex
+++ b/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v3_signed_bob.apex
Binary files differ

hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v3_signed_bob_rot.apex

diff --git a/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v3_signed_bob_rot.apex b/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v3_signed_bob_rot.apex
index 429b864..017096e 100644
--- a/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v3_signed_bob_rot.apex
+++ b/hostsidetests/stagedinstall/testdata/apex/x86/com.android.apex.cts.shim.v3_signed_bob_rot.apex
Binary files differ

hostsidetests/stagedinstall/testdata/apk/CtsShimTargetPSdk/arm/CtsShimTargetPSdk.apk

diff --git a/hostsidetests/stagedinstall/testdata/apk/CtsShimTargetPSdk/arm/CtsShimTargetPSdk.apk b/hostsidetests/stagedinstall/testdata/apk/CtsShimTargetPSdk/arm/CtsShimTargetPSdk.apk
index faf4ec8..065528c 100644
--- a/hostsidetests/stagedinstall/testdata/apk/CtsShimTargetPSdk/arm/CtsShimTargetPSdk.apk
+++ b/hostsidetests/stagedinstall/testdata/apk/CtsShimTargetPSdk/arm/CtsShimTargetPSdk.apk
Binary files differ

hostsidetests/stagedinstall/testdata/apk/CtsShimTargetPSdk/x86/CtsShimTargetPSdk.apk

diff --git a/hostsidetests/stagedinstall/testdata/apk/CtsShimTargetPSdk/x86/CtsShimTargetPSdk.apk b/hostsidetests/stagedinstall/testdata/apk/CtsShimTargetPSdk/x86/CtsShimTargetPSdk.apk
index faf4ec8..065528c 100644
--- a/hostsidetests/stagedinstall/testdata/apk/CtsShimTargetPSdk/x86/CtsShimTargetPSdk.apk
+++ b/hostsidetests/stagedinstall/testdata/apk/CtsShimTargetPSdk/x86/CtsShimTargetPSdk.apk
Binary files differ