Fixed the use of init-sdcard.rc file

3 files changed, 10 insertions, 7 deletions

diff --git a/Android.mk b/Android.mk
index 881d8ff..77b6228 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,6 +16,14 @@ LOCAL_PATH := $(call my-dir)
 
 ifeq ($(TARGET_DEVICE),gta04)
 
+ifeq ($(BOARD_SDCARD_INIT),true)
+file := $(TARGET_ROOT_OUT)/init.rc
+$(file) : $(LOCAL_PATH)/init-sdcard.rc | $(ACP)
+	$(transform-prebuilt-to-target)
+ALL_PREBUILT += $(file)
+$(INSTALLED_RAMDISK_TARGET): $(file)
+endif
+
 ifneq ($(TARGET_SIMULATOR),true)
 include $(call all-makefiles-under,$(LOCAL_PATH))
 endif
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 2a1d3ad..32c1b69 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -46,7 +46,8 @@ USE_CAMERA_STUB := true
 
 # Init
 # set BOARD_SDCARD_INIT to true if booting from sdcard
-BOARD_SDCARD_INIT := false
+BOARD_SDCARD_INIT ?= false
 ifeq ($(BOARD_SDCARD_INIT),true)
 TARGET_PROVIDES_INIT := true
+TARGET_PROVIDES_INIT_RC := true
 endif
diff --git a/gta04.mk b/gta04.mk
index 2b614f8..fcea74c 100644
--- a/gta04.mk
+++ b/gta04.mk
@@ -17,12 +17,6 @@
 PRODUCT_COPY_FILES := \
 	device/goldelico/gta04/vold.fstab:system/etc/vold.fstab
 
-# Init
-ifeq ($(BOARD_SDCARD_INIT),true)
-PRODUCT_COPY_FILES += \
-	device/goldelico/gta04/init-sdcard.rc:root/init.rc
-endif
-
 # APNS
 PRODUCT_COPY_FILES += \
         vendor/replicant/prebuilt/common/etc/apns-conf.xml:system/etc/apns-conf.xml