diff options
| author | Inseob Kim <inseob@google.com> | 2018-05-31 13:03:58 +0900 |
|---|---|---|
| committer | Inseob Kim <inseob@google.com> | 2018-06-01 10:38:57 +0900 |
| commit | 9bd3ee1c4f14f268b0959edd891ef852b95370b8 (patch) | |
| tree | 1cda29d5f9f175e9aa898ccd7abfd76ab1241db9 | |
| parent | f88508898ccd9cf1980963ac0c9a46e334659053 (diff) | |
| download | core-9bd3ee1c4f14f268b0959edd891ef852b95370b8.tar.gz | |
Support /product/bin
Bug: 80422611
Test: m -j succeeded and permissions of files under /product/bin are set
correctly
Change-Id: I83377d809c47c92da6b226d2853ea6a7462fb127
Merged-In: I83377d809c47c92da6b226d2853ea6a7462fb127
(cherry picked from commit 25195daaca079e048e47b38b83fc41527a89ccb0)
| -rw-r--r-- | libcutils/fs_config.cpp | 7 | ||||
| -rw-r--r-- | rootdir/etc/ld.config.txt | 1 | ||||
| -rw-r--r-- | rootdir/etc/ld.config.vndk_lite.txt | 1 |
3 files changed, 7 insertions, 2 deletions
diff --git a/libcutils/fs_config.cpp b/libcutils/fs_config.cpp index cd61d950d..5b79b1d7d 100644 --- a/libcutils/fs_config.cpp +++ b/libcutils/fs_config.cpp @@ -80,6 +80,7 @@ static const struct fs_path_config android_dirs[] = { { 00775, AID_ROOT, AID_ROOT, 0, "data/preloads" }, { 00771, AID_SYSTEM, AID_SYSTEM, 0, "data" }, { 00755, AID_ROOT, AID_SYSTEM, 0, "mnt" }, + { 00755, AID_ROOT, AID_SHELL, 0, "product/bin" }, { 00750, AID_ROOT, AID_SHELL, 0, "sbin" }, { 00777, AID_ROOT, AID_ROOT, 0, "sdcard" }, { 00751, AID_ROOT, AID_SDCARD_R, 0, "storage" }, @@ -195,6 +196,7 @@ static const struct fs_path_config android_files[] = { { 00755, AID_ROOT, AID_ROOT, 0, "bin/*" }, { 00640, AID_ROOT, AID_SHELL, 0, "fstab.*" }, { 00750, AID_ROOT, AID_SHELL, 0, "init*" }, + { 00755, AID_ROOT, AID_SHELL, 0, "product/bin/*" }, { 00750, AID_ROOT, AID_SHELL, 0, "sbin/*" }, { 00755, AID_ROOT, AID_SHELL, 0, "system/bin/*" }, { 00755, AID_ROOT, AID_ROOT, 0, "system/lib/valgrind/*" }, @@ -237,9 +239,10 @@ static int fs_config_open(int dir, int which, const char* target_out_path) { return fd; } -// if path is "vendor/<stuff>", "oem/<stuff>" or "odm/<stuff>" +// if path is "odm/<stuff>", "oem/<stuff>", "product/<stuff>" or +// "vendor/<stuff>" static bool is_partition(const char* path, size_t len) { - static const char* partitions[] = {"vendor/", "oem/", "odm/"}; + static const char* partitions[] = {"odm/", "oem/", "product/", "vendor/"}; for (size_t i = 0; i < (sizeof(partitions) / sizeof(partitions[0])); ++i) { size_t plen = strlen(partitions[i]); if (len <= plen) continue; diff --git a/rootdir/etc/ld.config.txt b/rootdir/etc/ld.config.txt index 51e3f9efc..a0b1996ad 100644 --- a/rootdir/etc/ld.config.txt +++ b/rootdir/etc/ld.config.txt @@ -7,6 +7,7 @@ # absolute path of an executable is selected. dir.system = /system/bin/ dir.system = /system/xbin/ +dir.system = /product/bin/ dir.vendor = /odm/bin/ dir.vendor = /vendor/bin/ diff --git a/rootdir/etc/ld.config.vndk_lite.txt b/rootdir/etc/ld.config.vndk_lite.txt index ab0375539..db65c14fc 100644 --- a/rootdir/etc/ld.config.vndk_lite.txt +++ b/rootdir/etc/ld.config.vndk_lite.txt @@ -7,6 +7,7 @@ # absolute path of an executable is selected. dir.system = /system/bin/ dir.system = /system/xbin/ +dir.system = /product/bin/ dir.vendor = /odm/bin/ dir.vendor = /vendor/bin/ |