From 53dbea3dfa65bf1270db00f25c4b542715091fc5 Mon Sep 17 00:00:00 2001
From: Andreas Blaesius <skate4life@gmx.de>
Date: Sun, 30 Oct 2016 11:35:28 +0100
Subject: Some nitpicks & sync with AOSP

Change-Id: Ib2651576cbd99a2dcd2c3e58065d7e7d4897c66b
---
 device-common.mk | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'device-common.mk')

diff --git a/device-common.mk b/device-common.mk
index 6294f76..754f802 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -21,6 +21,9 @@ TARGET_BOARD_OMAP_CPU := 4430
 # Include common omap4 makefile
 $(call inherit-product, hardware/ti/omap4/omap4.mk)
 
+# Include CM specific additions
+$(call inherit-product, device/samsung/espressowifi/device-cm.mk)
+
 DEVICE_PACKAGE_OVERLAYS += \
     $(LOCAL_PATH)/overlay/aosp-common
 
@@ -38,13 +41,6 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/rootdir/fstab.espresso:root/fstab.espresso
 
-# Recovery Ramdisk
-PRODUCT_PACKAGES += \
-    $(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
-
 # GPS
 # gps config appropriate for this device
 $(call inherit-product, device/common/gps/gps_us_supl.mk)
@@ -56,7 +52,7 @@ PRODUCT_PACKAGES += \
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/gps.xml:system/etc/gps.xml
 
-# Wifi
+# Wi-Fi
 PRODUCT_PACKAGES += \
     libwpa_client \
     hostapd \
@@ -93,6 +89,7 @@ PRODUCT_PACKAGES += \
     audio.r_submix.default \
     audio.usb.default \
     camera.omap4 \
+    e2fsck \
     lights.omap4 \
     libinvensense_mpl \
     power.piranha \
-- 
cgit v1.1