Snap for 12304452 from 536c6454d075797127e20458df730328dfe8d7a5 to 24Q4-release
Change-Id: I7c5f4a41e9625a1175c594dda63cfa5afd3488b3
diff --git a/fs_mgr/libsnapshot/Android.bp b/fs_mgr/libsnapshot/Android.bp
index 4828c4c..50efb03 100644
--- a/fs_mgr/libsnapshot/Android.bp
+++ b/fs_mgr/libsnapshot/Android.bp
@@ -46,7 +46,6 @@
"libfstab",
"libsnapuserd_client",
"libz",
- "libselinux",
],
header_libs: [
"libfiemap_headers",
@@ -112,6 +111,9 @@
static_libs: [
"libfs_mgr_binder",
],
+ whole_static_libs: [
+ "libselinux",
+ ],
}
cc_library {
@@ -130,6 +132,9 @@
static_libs: [
"libsnapshot_cow",
],
+ whole_static_libs: [
+ "libselinux",
+ ],
}
cc_library_static {
@@ -144,6 +149,7 @@
],
static_libs: [
"libfs_mgr",
+ "libselinux",
],
}
@@ -161,6 +167,9 @@
static_libs: [
"libfs_mgr",
],
+ whole_static_libs: [
+ "libselinux",
+ ],
}
cc_defaults {
@@ -243,6 +252,7 @@
"libfs_mgr",
"libgmock",
"libgtest",
+ "libselinux",
],
}
@@ -285,7 +295,6 @@
],
auto_gen_config: true,
require_root: true,
- compile_multilib: "first",
}
cc_test {
@@ -298,6 +307,15 @@
"vts",
"general-tests",
],
+ compile_multilib: "both",
+ multilib: {
+ lib32: {
+ suffix: "32",
+ },
+ lib64: {
+ suffix: "64",
+ },
+ },
test_options: {
min_shipping_api_level: 30,
},
@@ -315,6 +333,7 @@
test_suites: [
"general-tests",
],
+ compile_multilib: "64",
test_options: {
// Legacy VAB launched in Android R.
min_shipping_api_level: 30,
diff --git a/fs_mgr/libsnapshot/snapuserd/Android.bp b/fs_mgr/libsnapshot/snapuserd/Android.bp
index 734066b..8d0bf7d 100644
--- a/fs_mgr/libsnapshot/snapuserd/Android.bp
+++ b/fs_mgr/libsnapshot/snapuserd/Android.bp
@@ -239,9 +239,19 @@
test_options: {
min_shipping_api_level: 30,
},
+
+ compile_multilib: "both",
+ multilib: {
+ lib32: {
+ suffix: "32",
+ },
+ lib64: {
+ suffix: "64",
+ },
+ },
+
auto_gen_config: true,
require_root: true,
- compile_multilib: "first",
}
cc_test {
diff --git a/init/devices.cpp b/init/devices.cpp
index 5560c20..f2bb9d2 100644
--- a/init/devices.cpp
+++ b/init/devices.cpp
@@ -283,7 +283,7 @@
void DeviceHandler::MakeDevice(const std::string& path, bool block, int major, int minor,
const std::vector<std::string>& links) const {
- auto[mode, uid, gid] = GetDevicePermissions(path, links);
+ auto [mode, uid, gid] = GetDevicePermissions(path, links);
mode |= (block ? S_IFBLK : S_IFCHR);
std::string secontext;
@@ -330,11 +330,11 @@
if (gid != s.st_gid) {
new_group = gid;
}
- if (mode != s.st_mode) {
- if (chmod(path.c_str(), mode) != 0) {
- PLOG(ERROR) << "Cannot chmod " << path << " to " << mode;
+ if (mode != s.st_mode) {
+ if (chmod(path.c_str(), mode) != 0) {
+ PLOG(ERROR) << "Cannot chmod " << path << " to " << mode;
+ }
}
- }
} else {
PLOG(ERROR) << "Cannot stat " << path;
}
@@ -531,7 +531,7 @@
if (!ReadFileToString(boot_id_path, &boot_id)) {
PLOG(ERROR) << "Cannot duplicate ashmem device node. Failed to read " << boot_id_path;
return;
- };
+ }
boot_id = Trim(boot_id);
Uevent dup_ashmem_uevent = uevent;
@@ -542,10 +542,10 @@
}
void DeviceHandler::HandleUevent(const Uevent& uevent) {
- if (uevent.action == "add" || uevent.action == "change" ||
- uevent.action == "bind" || uevent.action == "online") {
- FixupSysPermissions(uevent.path, uevent.subsystem);
- }
+ if (uevent.action == "add" || uevent.action == "change" || uevent.action == "bind" ||
+ uevent.action == "online") {
+ FixupSysPermissions(uevent.path, uevent.subsystem);
+ }
// if it's not a /dev device, nothing to do
if (uevent.major < 0 || uevent.minor < 0) return;
diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index f866e9b..ac9ca85 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -35,7 +35,8 @@
ln -sf /system/etc $(TARGET_ROOT_OUT)/etc; \
ln -sf /data/user_de/0/com.android.shell/files/bugreports $(TARGET_ROOT_OUT)/bugreports; \
ln -sfn /sys/kernel/debug $(TARGET_ROOT_OUT)/d; \
- ln -sf /storage/self/primary $(TARGET_ROOT_OUT)/sdcard
+ ln -sf /storage/self/primary $(TARGET_ROOT_OUT)/sdcard; \
+ ln -sf /product/etc/security/adb_keys $(TARGET_ROOT_OUT)/adb_keys
ALL_ROOTDIR_SYMLINKS := \
$(TARGET_ROOT_OUT)/bin \
@@ -150,4 +151,3 @@
init.environ.rc-soong := $(call intermediates-dir-for,ETC,init.environ.rc-soong)/init.environ.rc-soong
$(eval $(call copy-one-file,$(init.environ.rc-soong),$(LOCAL_BUILT_MODULE)))
init.environ.rc-soong :=
-