| commit | b90099d84e5a3629b7e6a1abeb5dc1544d73de60 | [log] [tgz] |
|---|---|---|
| author | Jiyong Park <jiyong@google.com> | Wed Dec 15 11:08:07 2021 +0000 |
| committer | Nucca Chen <nuccachen@google.com> | Tue Jan 04 12:54:44 2022 +0000 |
| tree | 291e460f4b66982774b531d6845de2b8a2821f1f | |
| parent | 5d8246e2c9c9e0c04c472186e7f78a3938a93c35 [diff] [blame] |
Merge changes from topic "canned_fs_config" am: ae9cf26353 am: 33fd601118 am: a214351987 am: 7cc9a75156 Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1918606 Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1918605 Change-Id: I484e46ff819a5266c1e8046dae337e18ef3fefea Merged-In: I484e46ff819a5266c1e8046dae337e18ef3fefea Merged-In: I7f2576ff99c65bdb6c9ce4ace61bc783eea2f0d4 (cherry picked from commit 755e3808b23dcda177cdcf15c162bb25ddf231b6)
diff --git a/apex/apex.go b/apex/apex.go index 3b8c51a..f92e75d 100644 --- a/apex/apex.go +++ b/apex/apex.go
@@ -95,6 +95,14 @@ // /system/sepolicy/apex/<module_name>_file_contexts. File_contexts *string `android:"path"` + // Path to the canned fs config file for customizing file's uid/gid/mod/capabilities. The + // format is /<path_or_glob> <uid> <gid> <mode> [capabilities=0x<cap>], where path_or_glob is a + // path or glob pattern for a file or set of files, uid/gid are numerial values of user ID + // and group ID, mode is octal value for the file mode, and cap is hexadecimal value for the + // capability. If this property is not set, or a file is missing in the file, default config + // is used. + Canned_fs_config *string `android:"path"` + ApexNativeDependencies Multilib apexMultilibProperties