Merge changes from topic "wait-for-staged-session"
* changes:
Replace logic that waits for staged sessions to get ready in tests
Abandon active staged sessions before running tests
diff --git a/apexd/apexd_prop.cpp b/apexd/apexd_prop.cpp
index d9b4e47..ead35fb 100644
--- a/apexd/apexd_prop.cpp
+++ b/apexd/apexd_prop.cpp
@@ -35,7 +35,7 @@
// if not continue waiting for updatable_crashing.
// We use this strategy so that we can quickly detect if an updatable
// process is crashing.
- if (android::base::WaitForProperty("ro.init.updatable_crashing", "1",
+ if (android::base::WaitForProperty("sys.init.updatable_crashing", "1",
std::chrono::seconds(30))) {
LOG(INFO) << "Updatable crashing, attempting rollback";
auto status = rollback_fn();
diff --git a/tests/Android.bp b/tests/Android.bp
index 1ef4ef6..9567f3f 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -127,28 +127,6 @@
installable: false,
}
-// This target is not consumed by anyone. It's a sanity
-// check for the build features.
-apex {
- name: "apex_test_build_features",
- file_contexts: "apex.test",
- manifest: "testdata/apex_manifest.json",
- androidManifest: "testdata/AndroidManifest.xml",
- binaries: ["surfaceflinger", "vold"],
- multilib: {
- prefer32: {
- binaries: ["sample_prefer32_binary"],
- },
- },
- native_shared_libs: ["libc", "libcutils"],
- java_libs: ["conscrypt"],
- prebuilts: ["sample_prebuilt_file", "apex.test.ld.config.txt", "apex.test.init.rc"],
- compile_multilib: "both",
- key: "apex.test.key",
- certificate: ":apex.test.certificate",
- installable: false,
-}
-
apex_key {
name: "apex.test.key",
public_key: "testdata/com.android.apex.test.avbpubkey",
@@ -216,7 +194,6 @@
"apex_manifest_proto_java",
],
test_config: "apex-remount-tests.xml",
- test_suites: ["general-tests"],
data: [":com.android.apex.cts.shim.v2_prebuilt"],
}
