commit e7e63a692ae41ea0fe74ac658c93da1e9fe94a7c
author Mohammad Samiul Islam <samiul@google.com> Thu Jan 16 13:55:49 2020 +0000
committer Mohammad Samiul Islam <samiul@google.com> Thu Jan 16 14:00:28 2020 +0000
tree 01602e1f0dbe6e72170868ddc71c653049a11009
parent 400124c6aecf5cfcd06f101d2260c016f3b6cae5

Revert "Revert "Make RollbackPackageHealthObserver observe apk-in-apex""

This reverts commit 400124c6aecf5cfcd06f101d2260c016f3b6cae5.

Reason for revert: Fixed the compile error; TestAppACrashingV2 was not
available to com.android.apex.apkrollback.test_v1

Change-Id: Ic443e913b837c9bb2716678521ad1d12d3bc7e4d

tests/RollbackTest/Android.bp

diff --git a/tests/RollbackTest/Android.bp b/tests/RollbackTest/Android.bp
index 091edd4..98e7b4e 100644
--- a/tests/RollbackTest/Android.bp
+++ b/tests/RollbackTest/Android.bp
@@ -19,7 +19,10 @@
     static_libs: ["androidx.test.rules", "cts-rollback-lib", "cts-install-lib"],
     test_suites: ["general-tests"],
     test_config: "RollbackTest.xml",
-    java_resources: [":com.android.apex.apkrollback.test_v2"],
+    java_resources: [
+        ":com.android.apex.apkrollback.test_v2",
+        ":com.android.apex.apkrollback.test_v2Crashing"
+    ],
 }
 
 java_test_host {
@@ -79,4 +82,14 @@
   key: "com.android.apex.apkrollback.test.key",
   apps: ["TestAppAv2"],
   installable: false,
+}
+
+apex {
+  name: "com.android.apex.apkrollback.test_v2Crashing",
+  manifest: "testdata/manifest_v2.json",
+  androidManifest: "testdata/AndroidManifest.xml",
+  file_contexts: ":apex.test-file_contexts",
+  key: "com.android.apex.apkrollback.test.key",
+  apps: ["TestAppACrashingV2"],
+  installable: false,
 }
\ No newline at end of file