diff options
| -rw-r--r-- | BoardConfigCommon.mk | 2 | ||||
| -rw-r--r-- | device-common.mk | 19 | ||||
| -rw-r--r-- | rootdir/Android.mk | 52 | ||||
| -rw-r--r-- | rootdir/fstab.espresso (renamed from rootdir/etc/fstab.tab2) | 0 | ||||
| -rw-r--r-- | rootdir/init.espresso.rc (renamed from rootdir/etc/init.tab2.rc) | 0 | ||||
| -rw-r--r-- | rootdir/init.espresso.sensors.rc (renamed from rootdir/etc/init.tab2.sensors.rc) | 0 | ||||
| -rw-r--r-- | rootdir/init.espresso.usb.rc (renamed from rootdir/etc/init.tab2.usb.rc) | 0 | ||||
| -rw-r--r-- | rootdir/ueventd.espresso.rc (renamed from rootdir/etc/ueventd.tab2.rc) | 0 |
8 files changed, 12 insertions, 61 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index a7bf3d3..4f8956b 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -83,5 +83,5 @@ BOARD_SEPOLICY_DIRS += \ # Recovery RECOVERY_FSTAB_VERSION := 2 -TARGET_RECOVERY_FSTAB := device/samsung/espressowifi/rootdir/etc/fstab.tab2 +TARGET_RECOVERY_FSTAB := device/samsung/espressowifi/rootdir/fstab.espresso TARGET_RECOVERY_PIXEL_FORMAT := "BGRA_8888" diff --git a/device-common.mk b/device-common.mk index dd3c1d2..6294f76 100644 --- a/device-common.mk +++ b/device-common.mk @@ -27,17 +27,20 @@ DEVICE_PACKAGE_OVERLAYS += \ PRODUCT_AAPT_CONFIG := large PRODUCT_AAPT_PREF_CONFIG := mdpi -# Ramdisk -PRODUCT_PACKAGES += \ - fstab.espresso \ - init.espresso.sensors.rc \ - init.espresso.usb.rc \ - init.espresso.rc \ - ueventd.espresso.rc +# Init files +PRODUCT_COPY_FILES += \ + $(LOCAL_PATH)/rootdir/init.espresso.rc:root/init.espresso.rc \ + $(LOCAL_PATH)/rootdir/init.espresso.sensors.rc:root/init.espresso.sensors.rc \ + $(LOCAL_PATH)/rootdir/init.espresso.usb.rc:root/init.espresso.usb.rc \ + $(LOCAL_PATH)/rootdir/ueventd.espresso.rc:root/ueventd.espresso.rc + +# Fstab +PRODUCT_COPY_FILES += \ + $(LOCAL_PATH)/rootdir/fstab.espresso:root/fstab.espresso # Recovery Ramdisk PRODUCT_PACKAGES += \ - init.recovery.espresso.rc + $(LOCAL_PATH)/recovery/root/init.recovery.espresso.rc:recovery/root/init.recovery.espresso.rc PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/init.espresso.variant.sh:system/bin/init.espresso.variant.sh diff --git a/rootdir/Android.mk b/rootdir/Android.mk deleted file mode 100644 index 1aa0cfc..0000000 --- a/rootdir/Android.mk +++ /dev/null @@ -1,52 +0,0 @@ -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.tab2 -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.tab2.rc -LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := init.espresso.sensors.rc -LOCAL_MODULE_TAGS := optional eng -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := etc/init.tab2.sensors.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.tab2.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.tab2.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/etc/fstab.tab2 b/rootdir/fstab.espresso index d0accb4..d0accb4 100644 --- a/rootdir/etc/fstab.tab2 +++ b/rootdir/fstab.espresso diff --git a/rootdir/etc/init.tab2.rc b/rootdir/init.espresso.rc index ae14256..ae14256 100644 --- a/rootdir/etc/init.tab2.rc +++ b/rootdir/init.espresso.rc diff --git a/rootdir/etc/init.tab2.sensors.rc b/rootdir/init.espresso.sensors.rc index 895f621..895f621 100644 --- a/rootdir/etc/init.tab2.sensors.rc +++ b/rootdir/init.espresso.sensors.rc diff --git a/rootdir/etc/init.tab2.usb.rc b/rootdir/init.espresso.usb.rc index e86a7bd..e86a7bd 100644 --- a/rootdir/etc/init.tab2.usb.rc +++ b/rootdir/init.espresso.usb.rc diff --git a/rootdir/etc/ueventd.tab2.rc b/rootdir/ueventd.espresso.rc index 3fa8bc2..3fa8bc2 100644 --- a/rootdir/etc/ueventd.tab2.rc +++ b/rootdir/ueventd.espresso.rc |