summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-07-20 10:49:19 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-07-20 10:49:19 +0000
commit01fe11169461cbf6b2be85ac7f198557419c2714 (patch)
treeda6c2f480edc8567c0cd66b46e38c92c5f2b60ee
parentedfe68a68a2663fc976a5f0867d21cea9355d7f0 (diff)
parent454b392eea4176e51f19fc70d20b8614c52d3701 (diff)
downloadcts-01fe11169461cbf6b2be85ac7f198557419c2714.tar.gz
Merge cherrypicks of [19290707] into tm-release.
Change-Id: Ic094a0a2c0caf886084916a9bd506c985cb6603b
-rw-r--r--apps/CtsVerifier/Android.bp2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/CtsVerifier/Android.bp b/apps/CtsVerifier/Android.bp
index b4485d19e99..9b2c16a3d09 100644
--- a/apps/CtsVerifier/Android.bp
+++ b/apps/CtsVerifier/Android.bp
@@ -114,7 +114,7 @@ android_test {
compile_multilib: "both",
- manifest: "AndroidManifest-verifierConfig.xml",
+ additional_manifests: ["AndroidManifest-verifierConfig.xml"],
jni_libs: [
"libctsverifier_jni",