aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Blaesius <skate4life@gmx.de>2016-03-22 16:50:17 +0100
committerAndreas Blaesius <skate4life@gmx.de>2016-03-29 00:55:40 +0200
commit0170cf1990450d74900e6b11e0578dc2c02138f8 (patch)
treeb57d8c271d0e12c5bfb698c3604594afa3dd743c
parent67565fb3412764ce711cb00e1112fd4ff5ee5593 (diff)
downloaddevice_samsung_espresso3g-0170cf1990450d74900e6b11e0578dc2c02138f8.zip
device_samsung_espresso3g-0170cf1990450d74900e6b11e0578dc2c02138f8.tar.gz
device_samsung_espresso3g-0170cf1990450d74900e6b11e0578dc2c02138f8.tar.bz2
Rename espresso to espressowifi to avoid conflicts with HTC's espresso
(myTouch 3G Slide T-Mobile - "espresso" - exist already ) Change-Id: I38ca47a705139241e7091d6f236ecda608c651cd
-rw-r--r--BoardConfig.mk4
-rw-r--r--cm.dependencies4
-rw-r--r--cm.mk2
-rw-r--r--device.mk2
-rwxr-xr-xextract-files.sh2
5 files changed, 7 insertions, 7 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 6487d3a..c7cee56 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -15,12 +15,12 @@
#
# Include common espresso BoardConfig
-include device/samsung/espresso/BoardConfigCommon.mk
+include device/samsung/espressowifi/BoardConfigCommon.mk
TARGET_SPECIFIC_HEADER_PATH += device/samsung/espresso3g/include
# assert
-TARGET_OTA_ASSERT_DEVICE := espresso,p3100,GT-P3100,espressorf,espressorfxx,p5100,GT-P5100,espresso10rf,espresso10rfxx
+TARGET_OTA_ASSERT_DEVICE := espresso-common,p3100,GT-P3100,espressorf,espressorfxx,p5100,GT-P5100,espresso10rf,espresso10rfxx
# RIL
BOARD_VENDOR := samsung
diff --git a/cm.dependencies b/cm.dependencies
index 89558c8..03b73e7 100644
--- a/cm.dependencies
+++ b/cm.dependencies
@@ -1,7 +1,7 @@
[
{
- "repository": "android_device_samsung_espresso",
- "target_path": "device/samsung/espresso"
+ "repository": "android_device_samsung_espressowifi",
+ "target_path": "device/samsung/espressowifi"
},
{
"repository": "android_hardware_samsung",
diff --git a/cm.mk b/cm.mk
index c0bc46c..c9a0a4c 100644
--- a/cm.mk
+++ b/cm.mk
@@ -23,7 +23,7 @@ $(call inherit-product, vendor/cm/config/common_full_phone.mk)
# CyanogenMod specific overlay
DEVICE_PACKAGE_OVERLAYS += device/samsung/espresso3g/overlay/cm
-DEVICE_PACKAGE_OVERLAYS += device/samsung/espresso/overlay/cm-common
+DEVICE_PACKAGE_OVERLAYS += device/samsung/espressowifi/overlay/cm-common
# Inherit device specific configuration
$(call inherit-product, device/samsung/espresso3g/aosp_espresso3g.mk)
diff --git a/device.mk b/device.mk
index 76a2294..2cb1f77 100644
--- a/device.mk
+++ b/device.mk
@@ -15,7 +15,7 @@
#
# Include espresso-common makefile
-$(call inherit-product, device/samsung/espresso/espresso-common.mk)
+$(call inherit-product, device/samsung/espressowifi/espresso-common.mk)
# Include 3g overlays
DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay/aosp
diff --git a/extract-files.sh b/extract-files.sh
index 53ee691..7edbe69 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -104,4 +104,4 @@ EOF
EOF
-./../espresso/extract-files.sh
+./../espressowifi/extract-files.sh