Merge changes from topic "lpdump-snapshots" into main
* changes: Remove local_include_dirs from fs_mgr_defaults. Allow processes in the "system" group to read /metadata/ota.
This commit is contained in:
commit
f489314dec
3 changed files with 5 additions and 3 deletions
|
|
@ -49,7 +49,6 @@ cc_defaults {
|
|||
sanitize: {
|
||||
misc_undefined: ["integer"],
|
||||
},
|
||||
local_include_dirs: ["include/"],
|
||||
cflags: [
|
||||
"-Wall",
|
||||
"-Werror",
|
||||
|
|
@ -60,6 +59,7 @@ cc_defaults {
|
|||
name: "libfs_mgr_defaults",
|
||||
defaults: ["fs_mgr_defaults"],
|
||||
export_include_dirs: ["include"],
|
||||
local_include_dirs: ["include/"],
|
||||
include_dirs: ["system/vold"],
|
||||
cflags: [
|
||||
"-D_FILE_OFFSET_BITS=64",
|
||||
|
|
@ -188,6 +188,7 @@ cc_library_static {
|
|||
],
|
||||
host_supported: true,
|
||||
defaults: ["fs_mgr_defaults"],
|
||||
local_include_dirs: ["include/"],
|
||||
srcs: [
|
||||
"fs_mgr_fstab.cpp",
|
||||
"fs_mgr_boot_config.cpp",
|
||||
|
|
|
|||
|
|
@ -57,6 +57,7 @@ cc_library_static {
|
|||
defaults: [
|
||||
"fs_mgr_defaults",
|
||||
],
|
||||
local_include_dirs: ["include/"],
|
||||
srcs: [
|
||||
"dm-snapshot-merge/snapuserd.cpp",
|
||||
"dm-snapshot-merge/snapuserd_worker.cpp",
|
||||
|
|
|
|||
|
|
@ -604,8 +604,8 @@ on post-fs
|
|||
chmod 0700 /metadata/vold
|
||||
mkdir /metadata/password_slots 0771 root system
|
||||
mkdir /metadata/bootstat 0750 system log
|
||||
mkdir /metadata/ota 0700 root system
|
||||
mkdir /metadata/ota/snapshots 0700 root system
|
||||
mkdir /metadata/ota 0750 root system
|
||||
mkdir /metadata/ota/snapshots 0750 root system
|
||||
mkdir /metadata/userspacereboot 0770 root system
|
||||
mkdir /metadata/watchdog 0770 root system
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue