diff options
author | Bowgo Tsai | 2017-09-12 04:56:37 -0500 |
---|---|---|
committer | Bowgo Tsai | 2017-09-28 05:10:58 -0500 |
commit | 144893e5ec6cd8d6a0ff11d8adc5440e6f86635a (patch) | |
tree | f22e08aa37d3085add0a774bbd47fbb7915eaf21 | |
parent | 61578ab50be06745dfac57aa106aeb996e5326df (diff) | |
download | platform-system-core-144893e5ec6cd8d6a0ff11d8adc5440e6f86635a.tar.gz platform-system-core-144893e5ec6cd8d6a0ff11d8adc5440e6f86635a.tar.xz platform-system-core-144893e5ec6cd8d6a0ff11d8adc5440e6f86635a.zip |
Removing $(PRODUCT_OUT)/root/root
Bug: 65570851
Test: boot sailfish
Change-Id: I80c3c3de23c57343187fde207980731b5341bc1f
Merged-In: I80c3c3de23c57343187fde207980731b5341bc1f
(cherry picked from commit ededee3e400d4caa50c04c2e0ec5d92a56e39425)
-rw-r--r-- | CleanSpec.mk | 1 | ||||
-rw-r--r-- | libcutils/fs_config.cpp | 1 | ||||
-rw-r--r-- | rootdir/Android.mk | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 5b5eff406..304ce4ec0 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk | |||
@@ -60,3 +60,4 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/hw/gatekeeper.$(TARGET_D | |||
60 | $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib64/hw/gatekeeper.$(TARGET_DEVICE).so) | 60 | $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib64/hw/gatekeeper.$(TARGET_DEVICE).so) |
61 | $(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/vendor) | 61 | $(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/vendor) |
62 | $(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/init.rc) | 62 | $(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/init.rc) |
63 | $(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/root) | ||
diff --git a/libcutils/fs_config.cpp b/libcutils/fs_config.cpp index 118504051..bab095ede 100644 --- a/libcutils/fs_config.cpp +++ b/libcutils/fs_config.cpp | |||
@@ -80,7 +80,6 @@ static const struct fs_path_config android_dirs[] = { | |||
80 | { 00775, AID_ROOT, AID_ROOT, 0, "data/preloads" }, | 80 | { 00775, AID_ROOT, AID_ROOT, 0, "data/preloads" }, |
81 | { 00771, AID_SYSTEM, AID_SYSTEM, 0, "data" }, | 81 | { 00771, AID_SYSTEM, AID_SYSTEM, 0, "data" }, |
82 | { 00755, AID_ROOT, AID_SYSTEM, 0, "mnt" }, | 82 | { 00755, AID_ROOT, AID_SYSTEM, 0, "mnt" }, |
83 | { 00755, AID_ROOT, AID_ROOT, 0, "root" }, | ||
84 | { 00750, AID_ROOT, AID_SHELL, 0, "sbin" }, | 83 | { 00750, AID_ROOT, AID_SHELL, 0, "sbin" }, |
85 | { 00777, AID_ROOT, AID_ROOT, 0, "sdcard" }, | 84 | { 00777, AID_ROOT, AID_ROOT, 0, "sdcard" }, |
86 | { 00751, AID_ROOT, AID_SDCARD_R, 0, "storage" }, | 85 | { 00751, AID_ROOT, AID_SDCARD_R, 0, "storage" }, |
diff --git a/rootdir/Android.mk b/rootdir/Android.mk index 48a46c606..e199ed406 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk | |||
@@ -127,7 +127,7 @@ endif | |||
127 | # | 127 | # |
128 | # create some directories (some are mount points) and symlinks | 128 | # create some directories (some are mount points) and symlinks |
129 | LOCAL_POST_INSTALL_CMD := mkdir -p $(addprefix $(TARGET_ROOT_OUT)/, \ | 129 | LOCAL_POST_INSTALL_CMD := mkdir -p $(addprefix $(TARGET_ROOT_OUT)/, \ |
130 | sbin dev proc sys system data oem acct config storage mnt root $(BOARD_ROOT_EXTRA_FOLDERS)); \ | 130 | sbin dev proc sys system data oem acct config storage mnt $(BOARD_ROOT_EXTRA_FOLDERS)); \ |
131 | ln -sf /system/etc $(TARGET_ROOT_OUT)/etc; \ | 131 | ln -sf /system/etc $(TARGET_ROOT_OUT)/etc; \ |
132 | ln -sf /data/user_de/0/com.android.shell/files/bugreports $(TARGET_ROOT_OUT)/bugreports; \ | 132 | ln -sf /data/user_de/0/com.android.shell/files/bugreports $(TARGET_ROOT_OUT)/bugreports; \ |
133 | ln -sf /sys/kernel/debug $(TARGET_ROOT_OUT)/d; \ | 133 | ln -sf /sys/kernel/debug $(TARGET_ROOT_OUT)/d; \ |