aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--espresso-common.mk6
-rw-r--r--rootdir/Android.mk30
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