P31XX: cleanup / rework ramdisk parts for better readability (1/2)

init.espresso.rc need to be placed inside
/device/samsung/p3100/recovery/root because it else don't get included
to the recovery ramdisk.

Change-Id: Ic5ea906ccbc348a4201628ac3269f5500e7830f7

7 files changed, 56 insertions, 7 deletions

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index a04d750..0ddb0b4 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -115,7 +115,7 @@ BOARD_USES_MMCUTILS := true
 BOARD_HAS_NO_MISC_PARTITION := true
 BOARD_HAS_NO_SELECT_BUTTON := true
 BOARD_SUPPRESS_EMMC_WIPE := true
-TARGET_RECOVERY_FSTAB := device/samsung/p3100/rootdir/fstab.espresso
+TARGET_RECOVERY_FSTAB := device/samsung/p3100/rootdir/etc/fstab.espresso
 RECOVERY_FSTAB_VERSION := 2
 BOARD_HAS_DOWNLOAD_MODE := true
 
diff --git a/p31xx-common.mk b/p31xx-common.mk
index 1129c91..529ac8b 100755
--- a/p31xx-common.mk
+++ b/p31xx-common.mk
@@ -31,12 +31,16 @@ PRODUCT_AAPT_CONFIG := large
 PRODUCT_AAPT_PREF_CONFIG := mdpi
 PRODUCT_LOCALES += mdpi
 
-# Init files
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/rootdir/init.espresso.usb.rc:root/init.espresso.usb.rc \
-    $(LOCAL_PATH)/rootdir/init.espresso.rc:root/init.espresso.rc \
-    $(LOCAL_PATH)/rootdir/ueventd.espresso.rc:root/ueventd.espresso.rc \
-    $(LOCAL_PATH)/rootdir/fstab.espresso:root/fstab.espresso
+# Ramdisk
+PRODUCT_PACKAGES += \
+    fstab.espresso \
+    init.espresso.usb.rc \
+    init.espresso.rc \
+    ueventd.espresso.rc
+
+# Recovery Ramdisk
+PRODUCT_PACKAGES += \
+    init.recovery.espresso.rc
 
 # GPS
 PRODUCT_COPY_FILES += \
diff --git a/rootdir/Android.mk b/rootdir/Android.mk
new file mode 100644
index 0000000..3dab3a0
--- /dev/null
+++ b/rootdir/Android.mk
@@ -0,0 +1,45 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+# boot.img parts
+include $(CLEAR_VARS)
+LOCAL_MODULE       := fstab.espresso
+LOCAL_MODULE_TAGS  := optional eng
+LOCAL_MODULE_CLASS := ETC
+LOCAL_SRC_FILES    := etc/fstab.espresso
+LOCAL_MODULE_PATH  := $(TARGET_ROOT_OUT)
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE       := init.espresso.rc
+LOCAL_MODULE_TAGS  := optional eng
+LOCAL_MODULE_CLASS := ETC
+LOCAL_SRC_FILES    := etc/init.espresso.rc
+LOCAL_MODULE_PATH  := $(TARGET_ROOT_OUT)
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE       := init.espresso.usb.rc
+LOCAL_MODULE_TAGS  := optional eng
+LOCAL_MODULE_CLASS := ETC
+LOCAL_SRC_FILES    := etc/init.espresso.usb.rc
+LOCAL_MODULE_PATH  := $(TARGET_ROOT_OUT)
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE       := ueventd.espresso.rc
+LOCAL_MODULE_TAGS  := optional eng
+LOCAL_MODULE_CLASS := ETC
+LOCAL_SRC_FILES    := etc/ueventd.espresso.rc
+LOCAL_MODULE_PATH  := $(TARGET_ROOT_OUT)
+include $(BUILD_PREBUILT)
+
+
+# recovery.img parts
+include $(CLEAR_VARS)
+LOCAL_MODULE       := init.recovery.espresso.rc
+LOCAL_MODULE_TAGS  := optional eng
+LOCAL_MODULE_CLASS := ETC
+LOCAL_SRC_FILES    := ../recovery/root/init.recovery.espresso.rc
+LOCAL_MODULE_PATH  := $(TARGET_RECOVERY_ROOT_OUT)
+include $(BUILD_PREBUILT)
diff --git a/rootdir/fstab.espresso b/rootdir/etc/fstab.espresso
index ec2e4f4..ec2e4f4 100644
--- a/rootdir/fstab.espresso
+++ b/rootdir/etc/fstab.espresso
diff --git a/rootdir/init.espresso.rc b/rootdir/etc/init.espresso.rc
index cf7735a..cf7735a 100755
--- a/rootdir/init.espresso.rc
+++ b/rootdir/etc/init.espresso.rc
diff --git a/rootdir/init.espresso.usb.rc b/rootdir/etc/init.espresso.usb.rc
index e86a7bd..e86a7bd 100755
--- a/rootdir/init.espresso.usb.rc
+++ b/rootdir/etc/init.espresso.usb.rc
diff --git a/rootdir/ueventd.espresso.rc b/rootdir/etc/ueventd.espresso.rc
index f67f204..f67f204 100644
--- a/rootdir/ueventd.espresso.rc
+++ b/rootdir/etc/ueventd.espresso.rc