Keystore: Json based test added in keystore-wycheproof CTS
A gson library referenace is added in keystore-wycheproof CTS library.
Wycheprrof folder structure and package is followed in external/wycheproof hence target package is updated.
Bug: 205680093
Test: run cts -m CtsKeystoreWycheproofTestCases
Change-Id: I13f25f427461751e440d9f874a527cf33f3c8a65
diff --git a/tests/tests/keystore/Android.bp b/tests/tests/keystore/Android.bp
index 8b18756..a7e67e3 100644
--- a/tests/tests/keystore/Android.bp
+++ b/tests/tests/keystore/Android.bp
@@ -135,6 +135,7 @@
static_libs: [
"cts-core-test-runner-axt",
"wycheproof-keystore",
+ "wycheproof-gson",
],
// sdk_version: "test_current",
platform_apis: true,
diff --git a/tests/tests/keystore/CtsKeystoreWycheproofTestConfig.xml b/tests/tests/keystore/CtsKeystoreWycheproofTestConfig.xml
index 0b09028..83929f1 100644
--- a/tests/tests/keystore/CtsKeystoreWycheproofTestConfig.xml
+++ b/tests/tests/keystore/CtsKeystoreWycheproofTestConfig.xml
@@ -24,7 +24,7 @@
<option name="test-file-name" value="CtsKeystoreWycheproofTestCases.apk" />
</target_preparer>
<test class="com.android.tradefed.testtype.AndroidJUnitTest" >
- <option name="package" value="android.keystore.cts.wycheproof" />
+ <option name="package" value="com.google.security.wycheproof" />
<option name="runtime-hint" value="17m" />
<option name="test-timeout" value="34m" />
<option name="hidden-api-checks" value="false" />
diff --git a/tests/tests/keystore/CtsKeystoreWycheproofTestManifest.xml b/tests/tests/keystore/CtsKeystoreWycheproofTestManifest.xml
index 9ef7249..12e24f2 100644
--- a/tests/tests/keystore/CtsKeystoreWycheproofTestManifest.xml
+++ b/tests/tests/keystore/CtsKeystoreWycheproofTestManifest.xml
@@ -16,15 +16,15 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.keystore.cts.wycheproof">
+ package="com.google.security.wycheproof">
<application>
<uses-library android:name="android.test.runner" />
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="android.keystore.cts.wycheproof"
- android:label="CTS tests of android.keystore.cts.wycheproof">
+ android:targetPackage="com.google.security.wycheproof"
+ android:label="CTS tests of com.google.security.wycheproof">
<meta-data android:name="listener"
android:value="com.android.cts.runner.CtsTestRunListener" />
</instrumentation>
