summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaulK <contact@paulk.fr>2012-04-16 23:13:11 +0200
committerPaulK <contact@paulk.fr>2012-04-16 23:13:11 +0200
commit9a336979c235913fd785e06762ce79ed8dc4da72 (patch)
tree534a248d09abee91da2492c85a0864538a0ac288
parent74e60bef7863b5ea95840ce741fefefcbf78e317 (diff)
downloaddevice_goldelico_gta04-9a336979c235913fd785e06762ce79ed8dc4da72.zip
device_goldelico_gta04-9a336979c235913fd785e06762ce79ed8dc4da72.tar.gz
device_goldelico_gta04-9a336979c235913fd785e06762ce79ed8dc4da72.tar.bz2
Fixed the use of init-sdcard.rc file
-rw-r--r--Android.mk8
-rwxr-xr-xBoardConfig.mk3
-rw-r--r--gta04.mk6
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