aboutsummaryrefslogtreecommitdiffstats
path: root/rootdir
diff options
context:
space:
mode:
authorandi34 <skate4life@gmx.de>2015-08-12 12:03:46 +0200
committerAndreas Blaesius <skate4life@gmx.de>2015-08-12 21:27:35 +0200
commit429cd7489af8e418c4da2c6dd0b0cf6b134cafaf (patch)
treed62eb7a9665b02da4c3da204a91d65137f32dae3 /rootdir
parentf5985ce5c3b7a884e6b5e16d9442e634abbbd2fb (diff)
downloaddevice_samsung_espressowifi-429cd7489af8e418c4da2c6dd0b0cf6b134cafaf.zip
device_samsung_espressowifi-429cd7489af8e418c4da2c6dd0b0cf6b134cafaf.tar.gz
device_samsung_espressowifi-429cd7489af8e418c4da2c6dd0b0cf6b134cafaf.tar.bz2
espresso-common: cleanup and make the device tree-common
Change-Id: I631495d13cbd28d54a30358dbfdea6a24db6c1ea
Diffstat (limited to 'rootdir')
-rw-r--r--rootdir/Android.mk27
-rw-r--r--rootdir/etc/fstab.tab2 (renamed from rootdir/etc/fstab.espresso)0
-rw-r--r--[-rwxr-xr-x]rootdir/etc/init.tab2.rc (renamed from rootdir/etc/init.espresso.rc)0
-rw-r--r--[-rwxr-xr-x]rootdir/etc/init.tab2.usb.rc (renamed from rootdir/etc/init.espresso.usb.rc)0
-rw-r--r--rootdir/etc/ueventd.tab2.rc (renamed from rootdir/etc/ueventd.espresso.rc)0
5 files changed, 23 insertions, 4 deletions
diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index 3dab3a0..eb7cac5 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -3,39 +3,56 @@ include $(CLEAR_VARS)
# boot.img parts
include $(CLEAR_VARS)
+ifneq ($(filter p3100 p3110,$(TARGET_DEVICE)),)
LOCAL_MODULE := fstab.espresso
+else
+LOCAL_MODULE := fstab.espresso10
+endif
LOCAL_MODULE_TAGS := optional eng
LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES := etc/fstab.espresso
+LOCAL_SRC_FILES := etc/fstab.tab2
LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
+ifneq ($(filter p3100 p3110,$(TARGET_DEVICE)),)
LOCAL_MODULE := init.espresso.rc
+else
+LOCAL_MODULE := init.espresso10.rc
+endif
LOCAL_MODULE_TAGS := optional eng
LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES := etc/init.espresso.rc
+LOCAL_SRC_FILES := etc/init.tab2.rc
LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
+ifneq ($(filter p3100 p3110,$(TARGET_DEVICE)),)
LOCAL_MODULE := init.espresso.usb.rc
+else
+LOCAL_MODULE := init.espresso10.usb.rc
+endif
LOCAL_MODULE_TAGS := optional eng
LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES := etc/init.espresso.usb.rc
+LOCAL_SRC_FILES := etc/init.tab2.usb.rc
LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
+ifneq ($(filter p3100 p3110,$(TARGET_DEVICE)),)
LOCAL_MODULE := ueventd.espresso.rc
+else
+LOCAL_MODULE := ueventd.espresso10.rc
+endif
LOCAL_MODULE_TAGS := optional eng
LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES := etc/ueventd.espresso.rc
+LOCAL_SRC_FILES := etc/ueventd.tab2.rc
LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
include $(BUILD_PREBUILT)
# recovery.img parts
+ifneq ($(filter p3100 p3110,$(TARGET_DEVICE)),)
include $(CLEAR_VARS)
LOCAL_MODULE := init.recovery.espresso.rc
LOCAL_MODULE_TAGS := optional eng
@@ -43,3 +60,5 @@ LOCAL_MODULE_CLASS := ETC
LOCAL_SRC_FILES := ../recovery/root/init.recovery.espresso.rc
LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)
include $(BUILD_PREBUILT)
+endif
+
diff --git a/rootdir/etc/fstab.espresso b/rootdir/etc/fstab.tab2
index 2b15070..2b15070 100644
--- a/rootdir/etc/fstab.espresso
+++ b/rootdir/etc/fstab.tab2
diff --git a/rootdir/etc/init.espresso.rc b/rootdir/etc/init.tab2.rc
index 5a19ad0..5a19ad0 100755..100644
--- a/rootdir/etc/init.espresso.rc
+++ b/rootdir/etc/init.tab2.rc
diff --git a/rootdir/etc/init.espresso.usb.rc b/rootdir/etc/init.tab2.usb.rc
index e86a7bd..e86a7bd 100755..100644
--- a/rootdir/etc/init.espresso.usb.rc
+++ b/rootdir/etc/init.tab2.usb.rc
diff --git a/rootdir/etc/ueventd.espresso.rc b/rootdir/etc/ueventd.tab2.rc
index f67f204..f67f204 100644
--- a/rootdir/etc/ueventd.espresso.rc
+++ b/rootdir/etc/ueventd.tab2.rc