diff options
| author | Ziyan <jaraidaniel@gmail.com> | 2016-01-28 22:47:50 +0100 |
|---|---|---|
| committer | Andreas Blaesius <skate4life@gmx.de> | 2016-02-08 11:50:03 -0800 |
| commit | c872eb960fefa9e13d1ca0c4024174a6f9184446 (patch) | |
| tree | e06fd6735d369f671f440127698f27951d244d57 | |
| parent | 73beb37eb4460af14f0650cd45fb46607828bdec (diff) | |
| download | device_samsung_espressowifi-c872eb960fefa9e13d1ca0c4024174a6f9184446.zip device_samsung_espressowifi-c872eb960fefa9e13d1ca0c4024174a6f9184446.tar.gz device_samsung_espressowifi-c872eb960fefa9e13d1ca0c4024174a6f9184446.tar.bz2 | |
rootdir: remove espresso/espresso10 distinction
Change-Id: I23d332df9fa0e49a95218c9f54f421105dd101bd
| -rw-r--r-- | espresso-common.mk | 6 | ||||
| -rw-r--r-- | rootdir/Android.mk | 30 |
2 files changed, 1 insertions, 35 deletions
diff --git a/espresso-common.mk b/espresso-common.mk index 0c5de20..5d7d4ac 100644 --- a/espresso-common.mk +++ b/espresso-common.mk @@ -34,13 +34,9 @@ PRODUCT_LOCALES += mdpi # Ramdisk PRODUCT_PACKAGES += \ fstab.espresso \ - fstab.espresso10 \ init.espresso.usb.rc \ - init.espresso10.usb.rc \ init.espresso.rc \ - init.espresso10.rc \ - ueventd.espresso.rc \ - ueventd.espresso10.rc + ueventd.espresso.rc # Recovery Ramdisk PRODUCT_PACKAGES += \ diff --git a/rootdir/Android.mk b/rootdir/Android.mk index 8979072..4944835 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -10,34 +10,8 @@ LOCAL_SRC_FILES := etc/fstab.tab2 LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) include $(BUILD_PREBUILT) -ifneq ($(filter p5100 p5110,$(TARGET_DEVICE)),) include $(CLEAR_VARS) - -LOCAL_MODULE := fstab.espresso10 -LOCAL_MODULE_TAGS := optional eng -LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) - -include $(BUILD_SYSTEM)/base_rules.mk - -$(LOCAL_BUILT_MODULE): TARGET := fstab.espresso -$(LOCAL_BUILT_MODULE): SYMLINK := $(TARGET_ROOT_OUT)/$(LOCAL_MODULE) -$(LOCAL_BUILT_MODULE): - $(hide) echo "Symlink: $(SYMLINK) -> $(TARGET)" - $(hide) mkdir -p $(dir $@) - $(hide) mkdir -p $(dir $(SYMLINK)) - $(hide) rm -rf $@ - $(hide) rm -rf $(SYMLINK) - $(hide) ln -sf $(TARGET) $(SYMLINK) - $(hide) touch $@ -endif - -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.tab2.rc @@ -57,11 +31,7 @@ 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.tab2.rc |