Merge "Revert "Migrate vts_libsnapshot_test and friends to general-tests zip"" into main
diff --git a/fs_mgr/libsnapshot/snapuserd/user-space-merge/merge_worker.cpp b/fs_mgr/libsnapshot/snapuserd/user-space-merge/merge_worker.cpp
index bd7eaca..e6a9a29 100644
--- a/fs_mgr/libsnapshot/snapuserd/user-space-merge/merge_worker.cpp
+++ b/fs_mgr/libsnapshot/snapuserd/user-space-merge/merge_worker.cpp
@@ -17,6 +17,8 @@
#include <libsnapshot/cow_format.h>
#include <pthread.h>
+#include <android-base/properties.h>
+
#include "merge_worker.h"
#include "snapuserd_core.h"
#include "utility.h"
@@ -179,8 +181,8 @@
bufsink_.ResetBufferOffset();
if (snapuserd_->IsIOTerminated()) {
- SNAP_LOG(ERROR)
- << "MergeReplaceZeroOps: MergeWorker threads terminated - shutting down merge";
+ SNAP_LOG(ERROR) << "MergeReplaceZeroOps: MergeWorker threads terminated - shutting "
+ "down merge";
return false;
}
}
@@ -577,8 +579,10 @@
SNAP_LOG(ERROR) << "Merge terminated early...";
return true;
}
+ auto merge_thread_priority = android::base::GetUintProperty<uint32_t>(
+ "ro.virtual_ab.merge_thread_priority", ANDROID_PRIORITY_BACKGROUND);
- if (!SetThreadPriority(ANDROID_PRIORITY_BACKGROUND)) {
+ if (!SetThreadPriority(merge_thread_priority)) {
SNAP_PLOG(ERROR) << "Failed to set thread priority";
}
diff --git a/fs_mgr/libsnapshot/snapuserd/user-space-merge/read_worker.cpp b/fs_mgr/libsnapshot/snapuserd/user-space-merge/read_worker.cpp
index d40b6d1..ef311d4 100644
--- a/fs_mgr/libsnapshot/snapuserd/user-space-merge/read_worker.cpp
+++ b/fs_mgr/libsnapshot/snapuserd/user-space-merge/read_worker.cpp
@@ -14,11 +14,14 @@
* limitations under the License.
*/
+#include <android-base/properties.h>
+
#include <libsnapshot/cow_format.h>
#include <pthread.h>
#include "read_worker.h"
#include "snapuserd_core.h"
+#include "user-space-merge/worker.h"
#include "utility.h"
namespace android {
@@ -259,8 +262,10 @@
SNAP_LOG(INFO) << "Processing snapshot I/O requests....";
pthread_setname_np(pthread_self(), "ReadWorker");
+ auto worker_thread_priority = android::base::GetUintProperty<uint32_t>(
+ "ro.virtual_ab.worker_thread_priority", ANDROID_PRIORITY_NORMAL);
- if (!SetThreadPriority(ANDROID_PRIORITY_NORMAL)) {
+ if (!SetThreadPriority(worker_thread_priority)) {
SNAP_PLOG(ERROR) << "Failed to set thread priority";
}
diff --git a/init/Android.bp b/init/Android.bp
index 6526a93..7b7a856 100644
--- a/init/Android.bp
+++ b/init/Android.bp
@@ -664,22 +664,10 @@
filename_from_src: true,
}
-soong_config_module_type {
- name: "board_use_recovery_as_boot_phony",
- module_type: "phony",
- config_namespace: "ANDROID",
- bool_variables: ["BOARD_USES_RECOVERY_AS_BOOT"],
- properties: ["required"],
-}
-
-board_use_recovery_as_boot_phony {
+phony {
name: "init_vendor",
- soong_config_variables: {
- BOARD_USES_RECOVERY_AS_BOOT: {
- required: [],
- conditions_default: {
- required: ["init_first_stage"],
- },
- },
- },
+ required: select(soong_config_variable("ANDROID", "BOARD_USES_RECOVERY_AS_BOOT"), {
+ true: [],
+ default: ["init_first_stage"],
+ }),
}
diff --git a/libcutils/Android.bp b/libcutils/Android.bp
index e297581..39cae1b 100644
--- a/libcutils/Android.bp
+++ b/libcutils/Android.bp
@@ -47,6 +47,8 @@
defaults: ["libcutils_defaults"],
export_include_dirs: ["include"],
+ header_libs: ["libprocessgroup_headers"],
+ export_header_lib_headers: ["libprocessgroup_headers"],
target: {
vendor: {
override_export_include_dirs: ["include_outside_system"],