commit 9fec6af883ab328e6c3590e8bffd1c91cc3872e8
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Apr 28 12:03:48 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 28 12:03:48 2020 +0000
tree fef4eedab66a738888feaa62faf52801a8ac3d23
parent 6b25213d686030ed45dc453be7228140ebd8e9ee
parent 7109f5eec10e879c7e7e26d8dc9dae3d7307a424

Merge "Make the APKs visible to another test apex." into rvc-dev

packages/CtsShim/build/Android.bp

diff --git a/packages/CtsShim/build/Android.bp b/packages/CtsShim/build/Android.bp
index be79010..d41c672 100644
--- a/packages/CtsShim/build/Android.bp
+++ b/packages/CtsShim/build/Android.bp
@@ -76,6 +76,7 @@
         "com.android.apex.cts.shim.v2_no_hashtree",
         "com.android.apex.cts.shim.v2_legacy",
         "com.android.apex.cts.shim.v2_sdk_target_p",
+        "com.android.apex.cts.shim.v2_unsigned_payload",
         "com.android.apex.cts.shim.v3",
     ],
 }
@@ -148,6 +149,7 @@
         "com.android.apex.cts.shim.v2_no_hashtree",
         "com.android.apex.cts.shim.v2_legacy",
         "com.android.apex.cts.shim.v2_sdk_target_p",
+        "com.android.apex.cts.shim.v2_unsigned_payload",
         "com.android.apex.cts.shim.v3",
     ],
 }

packages/CtsShim/build/jni/Android.bp

diff --git a/packages/CtsShim/build/jni/Android.bp b/packages/CtsShim/build/jni/Android.bp
index 7a5b07e..4477582 100644
--- a/packages/CtsShim/build/jni/Android.bp
+++ b/packages/CtsShim/build/jni/Android.bp
@@ -25,6 +25,7 @@
         "com.android.apex.cts.shim.v2_no_hashtree",
         "com.android.apex.cts.shim.v2_legacy",
         "com.android.apex.cts.shim.v2_sdk_target_p",
+        "com.android.apex.cts.shim.v2_unsigned_payload",
         "com.android.apex.cts.shim.v3",
     ],
 }