diff options
Diffstat (limited to 'rootdir')
| -rw-r--r-- | rootdir/Android.mk | 15 | ||||
| -rw-r--r-- | rootdir/init.rc | 6 |
2 files changed, 12 insertions, 9 deletions
diff --git a/rootdir/Android.mk b/rootdir/Android.mk index e28dd30..3bb2262 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -11,10 +11,13 @@ ifeq ($(TARGET_PRODUCT),generic) copy_from += etc/vold.conf endif -# for non -user build, also copy emulator-support script into /system/etc -ifneq ($(TARGET_BUILD_VARIANT),user) +# the /system/etc/init.goldfish.sh is needed to enable emulator support +# in the system image. In theory, we don't need these for -user builds +# which are device-specific. However, these builds require at the moment +# to run the dex pre-optimization *in* the emulator. So keep the file until +# we are capable of running dex preopt on the host. +# copy_from += etc/init.goldfish.sh -endif copy_to := $(addprefix $(TARGET_OUT)/,$(copy_from)) copy_from := $(addprefix $(LOCAL_PATH)/,$(copy_from)) @@ -36,13 +39,13 @@ $(file) : $(LOCAL_PATH)/init.rc | $(ACP) ALL_PREBUILT += $(file) endif -# for non -user build, also copy emulator-specific init script into / -ifneq ($(TARGET_BUILD_VARIANT),user) +# Just like /system/etc/init.goldfish.sh, the /init.godlfish.rc is here +# to allow -user builds to properly run the dex pre-optimization pass in +# the emulator. file := $(TARGET_ROOT_OUT)/init.goldfish.rc $(file) : $(LOCAL_PATH)/etc/init.goldfish.rc | $(ACP) $(transform-prebuilt-to-target) ALL_PREBUILT += $(file) -endif # create some directories (some are mount points) DIRS := $(addprefix $(TARGET_ROOT_OUT)/, \ diff --git a/rootdir/init.rc b/rootdir/init.rc index f9728ee..034e378 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -103,7 +103,7 @@ loglevel 3 # create basic filesystem structure mkdir /data/misc 01771 system misc mkdir /data/misc/bluetoothd 0770 bluetooth bluetooth - mkdir /data/misc/keystore 0770 keystore keystore + mkdir /data/misc/keystore 0700 keystore keystore mkdir /data/misc/vpn 0770 system system mkdir /data/misc/vpn/profiles 0770 system system # give system access to wpa_supplicant.conf for backup and restore @@ -336,7 +336,7 @@ service flash_recovery /system/etc/install-recovery.sh service racoon /system/bin/racoon socket racoon stream 600 system system # racoon will setuid to vpn after getting necessary resources. - group net_admin keystore + group net_admin disabled oneshot @@ -347,7 +347,7 @@ service mtpd /system/bin/mtpd disabled oneshot -service keystore /system/bin/keystore +service keystore /system/bin/keystore /data/misc/keystore user keystore group keystore socket keystore stream 666 |