summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-12-15 09:20:12 -0800
committerAndroid Code Review <code-review@android.com>2010-12-15 09:20:12 -0800
commit91f6fb6ce8ba4c19a1268a9ecc244ad38875720c (patch)
tree3528b663bdc497f0f916823d02495120c07df587
parent05af2c4a2b799455a8b6328bf89fdc13abba1b4f (diff)
parentc2dcefa3822e31ccb85644311b9df52ca541cf04 (diff)
downloaddiskinstaller-91f6fb6ce8ba4c19a1268a9ecc244ad38875720c.tar.gz
Merge "Make the /system/bin/sh link so installer.c works."tools_r9tools_r8froyo-plus-aosp
-rw-r--r--config.mk2
-rw-r--r--init.rc1
2 files changed, 2 insertions, 1 deletions
diff --git a/config.mk b/config.mk
index 11f17fc..c01d188 100644
--- a/config.mk
+++ b/config.mk
@@ -12,7 +12,7 @@ android_sysbase_modules := \
libm \
libstdc++ \
linker \
- sh \
+ ash \
toolbox \
logcat \
gdbserver \
diff --git a/init.rc b/init.rc
index 48cf3ca..5ba0f18 100644
--- a/init.rc
+++ b/init.rc
@@ -4,6 +4,7 @@ on init
export ANDROID_DATA /data
symlink /system/etc /etc
+ symlink /system/bin/ash /system/bin/sh
mkdir /data
mkdir /cache