diff options
| author | Yifan Hong <elsk@google.com> | 2020-11-20 21:09:34 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-20 21:09:34 +0000 |
| commit | 68d23f7fc539cb15fd382cc122cfdabf99bdf713 (patch) | |
| tree | 62ee534c7e8d775f678e6af44aee939c0d90dd4d | |
| parent | 4dab74ddef0522a9c8664c7cf7194abe6b212a9a (diff) | |
| parent | 0b76e8688f2d6e9b4d993f0b7867538b72aa8f7f (diff) | |
Merge changes from topic "e2fsprogs_vendor_ramdisk" am: 15cd1cd8fd am: 0b76e8688f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1506379
Change-Id: I56f790427c2b93a117b58735921a11f3109f00f8
| -rw-r--r-- | libcutils/fs_config.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libcutils/fs_config.cpp b/libcutils/fs_config.cpp index 31e1679db..79c3abca2 100644 --- a/libcutils/fs_config.cpp +++ b/libcutils/fs_config.cpp @@ -203,9 +203,14 @@ static const struct fs_path_config android_files[] = { CAP_MASK_LONG(CAP_SETGID), "system/bin/simpleperf_app_runner" }, { 00755, AID_ROOT, AID_ROOT, 0, "first_stage_ramdisk/system/bin/e2fsck" }, - { 00755, AID_ROOT, AID_ROOT, 0, "first_stage_ramdisk/system/bin/tune2fs" }, +#ifdef __LP64__ + { 00755, AID_ROOT, AID_ROOT, 0, "first_stage_ramdisk/system/bin/linker64" }, +#else + { 00755, AID_ROOT, AID_ROOT, 0, "first_stage_ramdisk/system/bin/linker" }, +#endif { 00755, AID_ROOT, AID_ROOT, 0, "first_stage_ramdisk/system/bin/resize2fs" }, { 00755, AID_ROOT, AID_ROOT, 0, "first_stage_ramdisk/system/bin/snapuserd" }, + { 00755, AID_ROOT, AID_ROOT, 0, "first_stage_ramdisk/system/bin/tune2fs" }, // generic defaults { 00755, AID_ROOT, AID_ROOT, 0, "bin/*" }, { 00640, AID_ROOT, AID_SHELL, 0, "fstab.*" }, |