diff options
author | Gavin Corkery <gavincorkery@google.com> | 2022-05-17 14:10:25 +0000 |
---|---|---|
committer | Gavin Corkery <gavincorkery@google.com> | 2022-05-17 16:49:22 +0000 |
commit | fd3a081aeea737262be24a6f71cd5a8e0abff94c (patch) | |
tree | e38f9d88e703398fdb9173e2474f7fff9a5e7817 /sdksandbox/tests/cts | |
parent | 5b78f7bff1c710de3f9d154f5ddd7aa870a4ead9 (diff) | |
download | AdServices-fd3a081aeea737262be24a6f71cd5a8e0abff94c.tar.gz |
Add sdk sandbox test signing keys
Removes the dependency on external keys by defining a set
of keys for testing inside the AdServices module.
Test: atest
Test: Manually install test apps
Bug: 215372846
Change-Id: If64e77f3bfdf581fbe70c8070173f0ca79ec28a6
Diffstat (limited to 'sdksandbox/tests/cts')
6 files changed, 11 insertions, 16 deletions
diff --git a/sdksandbox/tests/cts/endtoendtests/AndroidManifest.xml b/sdksandbox/tests/cts/endtoendtests/AndroidManifest.xml index 61ca94e414..1318650d57 100644 --- a/sdksandbox/tests/cts/endtoendtests/AndroidManifest.xml +++ b/sdksandbox/tests/cts/endtoendtests/AndroidManifest.xml @@ -24,22 +24,22 @@ <uses-library android:name="android.test.runner" /> <uses-sdk-library android:name="com.android.loadSdkSuccessfullySdkProvider" android:versionMajor="1" - android:certDigest="E4:95:82:FF:3A:0A:A4:C5:58:9F:C5:FE:AA:C6:B7:D6:E7:57:19:9D:D0:C6:74:2D:F7:BF:37:C2:FF:EF:95:F5" /> + android:certDigest="0B:44:2D:88:FA:A7:B3:AD:23:8D:DE:29:8A:A1:9B:D5:62:03:92:0B:BF:D8:D3:EB:C8:99:33:2C:8E:E1:15:99" /> <uses-sdk-library android:name="com.android.retryLoadSameSdkShouldFailSdkProvider" android:versionMajor="1" - android:certDigest="E4:95:82:FF:3A:0A:A4:C5:58:9F:C5:FE:AA:C6:B7:D6:E7:57:19:9D:D0:C6:74:2D:F7:BF:37:C2:FF:EF:95:F5" /> + android:certDigest="0B:44:2D:88:FA:A7:B3:AD:23:8D:DE:29:8A:A1:9B:D5:62:03:92:0B:BF:D8:D3:EB:C8:99:33:2C:8E:E1:15:99" /> <uses-sdk-library android:name="com.android.loadSdkWithInternalErrorSdkProvider" android:versionMajor="1" - android:certDigest="E4:95:82:FF:3A:0A:A4:C5:58:9F:C5:FE:AA:C6:B7:D6:E7:57:19:9D:D0:C6:74:2D:F7:BF:37:C2:FF:EF:95:F5" /> + android:certDigest="0B:44:2D:88:FA:A7:B3:AD:23:8D:DE:29:8A:A1:9B:D5:62:03:92:0B:BF:D8:D3:EB:C8:99:33:2C:8E:E1:15:99" /> <uses-sdk-library android:name="com.android.requestSurfacePackageSuccessfullySdkProvider" android:versionMajor="1" - android:certDigest="E4:95:82:FF:3A:0A:A4:C5:58:9F:C5:FE:AA:C6:B7:D6:E7:57:19:9D:D0:C6:74:2D:F7:BF:37:C2:FF:EF:95:F5" /> + android:certDigest="0B:44:2D:88:FA:A7:B3:AD:23:8D:DE:29:8A:A1:9B:D5:62:03:92:0B:BF:D8:D3:EB:C8:99:33:2C:8E:E1:15:99" /> <uses-sdk-library android:name="com.android.requestSurfacePackageWithInternalErrorSdkProvider" android:versionMajor="1" - android:certDigest="E4:95:82:FF:3A:0A:A4:C5:58:9F:C5:FE:AA:C6:B7:D6:E7:57:19:9D:D0:C6:74:2D:F7:BF:37:C2:FF:EF:95:F5" /> + android:certDigest="0B:44:2D:88:FA:A7:B3:AD:23:8D:DE:29:8A:A1:9B:D5:62:03:92:0B:BF:D8:D3:EB:C8:99:33:2C:8E:E1:15:99" /> <uses-sdk-library android:name="com.android.codeproviderresources" android:versionMajor="1" - android:certDigest="E4:95:82:FF:3A:0A:A4:C5:58:9F:C5:FE:AA:C6:B7:D6:E7:57:19:9D:D0:C6:74:2D:F7:BF:37:C2:FF:EF:95:F5" /> + android:certDigest="0B:44:2D:88:FA:A7:B3:AD:23:8D:DE:29:8A:A1:9B:D5:62:03:92:0B:BF:D8:D3:EB:C8:99:33:2C:8E:E1:15:99" /> </application> <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner" diff --git a/sdksandbox/tests/cts/endtoendtests/providers/loadSdkSuccessfully/Android.bp b/sdksandbox/tests/cts/endtoendtests/providers/loadSdkSuccessfully/Android.bp index b88d334ba5..cae04648db 100644 --- a/sdksandbox/tests/cts/endtoendtests/providers/loadSdkSuccessfully/Android.bp +++ b/sdksandbox/tests/cts/endtoendtests/providers/loadSdkSuccessfully/Android.bp @@ -19,8 +19,7 @@ package { android_test_helper_app { name: "LoadSdkSuccessfullySdkProvider", defaults: ["platform_app_defaults"], - // TODO(b/215372846): Create our own signing key. - certificate: ":cts-keyset-test-b", + certificate: ":sdksandbox-test", srcs: [ "src/**/*.java", ], diff --git a/sdksandbox/tests/cts/endtoendtests/providers/loadSdkWithInternalError/Android.bp b/sdksandbox/tests/cts/endtoendtests/providers/loadSdkWithInternalError/Android.bp index 01355f833f..ec948a6f95 100644 --- a/sdksandbox/tests/cts/endtoendtests/providers/loadSdkWithInternalError/Android.bp +++ b/sdksandbox/tests/cts/endtoendtests/providers/loadSdkWithInternalError/Android.bp @@ -19,8 +19,7 @@ package { android_test_helper_app { name: "LoadSdkWithInternalErrorSdkProvider", defaults: ["platform_app_defaults"], - // TODO(b/215372846): Create our own signing key. - certificate: ":cts-keyset-test-b", + certificate: ":sdksandbox-test", srcs: [ "src/**/*.java", ], diff --git a/sdksandbox/tests/cts/endtoendtests/providers/requestSurfacePackageSuccessfully/Android.bp b/sdksandbox/tests/cts/endtoendtests/providers/requestSurfacePackageSuccessfully/Android.bp index 0d924dfd78..4b0b7f9814 100644 --- a/sdksandbox/tests/cts/endtoendtests/providers/requestSurfacePackageSuccessfully/Android.bp +++ b/sdksandbox/tests/cts/endtoendtests/providers/requestSurfacePackageSuccessfully/Android.bp @@ -19,8 +19,7 @@ package { android_test_helper_app { name: "RequestSurfacePackageSuccessfullySdkProvider", defaults: ["platform_app_defaults"], - // TODO(b/215372846): Create our own signing key. - certificate: ":cts-keyset-test-b", + certificate: ":sdksandbox-test", srcs: [ "src/**/*.java", ], diff --git a/sdksandbox/tests/cts/endtoendtests/providers/requestSurfacePackageWithInternalError/Android.bp b/sdksandbox/tests/cts/endtoendtests/providers/requestSurfacePackageWithInternalError/Android.bp index 6f4019f657..9a7a221172 100644 --- a/sdksandbox/tests/cts/endtoendtests/providers/requestSurfacePackageWithInternalError/Android.bp +++ b/sdksandbox/tests/cts/endtoendtests/providers/requestSurfacePackageWithInternalError/Android.bp @@ -19,8 +19,7 @@ package { android_test_helper_app { name: "RequestSurfacePackageWithInternalErrorSdkProvider", defaults: ["platform_app_defaults"], - // TODO(b/215372846): Create our own signing key. - certificate: ":cts-keyset-test-b", + certificate: ":sdksandbox-test", srcs: [ "src/**/*.java", ], diff --git a/sdksandbox/tests/cts/endtoendtests/providers/retryLoadSameSdkShouldFail/Android.bp b/sdksandbox/tests/cts/endtoendtests/providers/retryLoadSameSdkShouldFail/Android.bp index 12dbd1d615..6c16bb6004 100644 --- a/sdksandbox/tests/cts/endtoendtests/providers/retryLoadSameSdkShouldFail/Android.bp +++ b/sdksandbox/tests/cts/endtoendtests/providers/retryLoadSameSdkShouldFail/Android.bp @@ -19,8 +19,7 @@ package { android_test_helper_app { name: "RetryLoadSameSdkShouldFailSdkProvider", defaults: ["platform_app_defaults"], - // TODO(b/215372846): Create our own signing key. - certificate: ":cts-keyset-test-b", + certificate: ":sdksandbox-test", srcs: [ "src/**/*.java", ], |