Merge "Rewrite `init_vendor` using select syntax" into main
diff --git a/fs_mgr/libsnapshot/Android.bp b/fs_mgr/libsnapshot/Android.bp
index 39b5b76..f098318 100644
--- a/fs_mgr/libsnapshot/Android.bp
+++ b/fs_mgr/libsnapshot/Android.bp
@@ -294,7 +294,7 @@
],
test_suites: [
"vts",
- "device-tests",
+ "general-tests",
],
test_options: {
min_shipping_api_level: 30,
@@ -311,7 +311,7 @@
"-DLIBSNAPSHOT_TEST_VAB_LEGACY",
],
test_suites: [
- "device-tests",
+ "general-tests",
],
test_options: {
// Legacy VAB launched in Android R.
@@ -414,7 +414,7 @@
"libstorage_literals_headers",
],
test_suites: [
- "device-tests",
+ "general-tests",
],
test_options: {
min_shipping_api_level: 30,
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"],
diff --git a/libstats/expresslog/Android.bp b/libstats/expresslog/Android.bp
index 004f8b9..96ab59b 100644
--- a/libstats/expresslog/Android.bp
+++ b/libstats/expresslog/Android.bp
@@ -47,6 +47,11 @@
"libstatssocket",
],
export_include_dirs: ["include"],
+ min_sdk_version: "33",
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.btservices",
+ ],
}
genrule {
@@ -75,6 +80,11 @@
shared_libs: [
"libstatssocket",
],
+ min_sdk_version: "33",
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.btservices",
+ ],
}
cc_test {