Rename espresso to espressowifi to avoid conflicts with HTC's espresso

(myTouch 3G Slide T-Mobile - "espresso" - exist already )

Change-Id: Ib4cd61b31e4dbb99204637d1cc8e75f8631b78e4

9 files changed, 23 insertions, 23 deletions

diff --git a/Android.mk b/Android.mk
index c7b3acd..fdd2840 100644
--- a/Android.mk
+++ b/Android.mk
@@ -23,6 +23,6 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifneq ($(filter espresso espresso3g,$(TARGET_DEVICE)),)
+ifneq ($(filter espressowifi espresso3g,$(TARGET_DEVICE)),)
 include $(call all-makefiles-under,$(LOCAL_PATH))
 endif
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 59bba81..63b8ec6 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -15,5 +15,5 @@
 #
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/aosp_espresso.mk \
+    $(LOCAL_DIR)/aosp_espressowifi.mk \
     $(LOCAL_DIR)/cm.mk
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 71cb113..2f6c2f3 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-include device/samsung/espresso/BoardConfigCommon.mk
+include device/samsung/espressowifi/BoardConfigCommon.mk
 
 # assert
-TARGET_OTA_ASSERT_DEVICE := espresso,p3110,GT-P3110,p3113,GT-P3113,espressowifi,espressowifixx,p5110,GT-P5110,p5113,GT-P5113,espresso10wifi,espresso10wifixx
+TARGET_OTA_ASSERT_DEVICE := espresso-common,p3110,GT-P3110,p3113,GT-P3113,espressowifi,espressowifixx,p5110,GT-P5110,p5113,GT-P5113,espresso10wifi,espresso10wifixx
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index b568517..55ed539 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -87,8 +87,8 @@ BOARD_NO_APSME_ATTR              := true
 # Bluetooth
 BOARD_HAVE_BLUETOOTH := true
 BOARD_HAVE_BLUETOOTH_BCM := true
-BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/samsung/espresso/bluetooth
-BOARD_BLUEDROID_VENDOR_CONF := device/samsung/espresso/bluetooth/vnd_espresso.txt
+BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/samsung/espressowifi/bluetooth
+BOARD_BLUEDROID_VENDOR_CONF := device/samsung/espressowifi/bluetooth/vnd_espresso.txt
 
 # Charger
 BOARD_CHARGER_SHOW_PERCENTAGE := true
@@ -101,7 +101,7 @@ BOARD_USE_LEGACY_SENSORS_FUSION := false
 
 # Selinux
 BOARD_SEPOLICY_DIRS += \
-    device/samsung/espresso/sepolicy
+    device/samsung/espressowifi/sepolicy
 
 # Recovery
 TARGET_RECOVERY_PIXEL_FORMAT := "BGRA_8888"
@@ -110,7 +110,7 @@ BOARD_USES_MMCUTILS := true
 BOARD_HAS_NO_MISC_PARTITION := true
 BOARD_HAS_NO_SELECT_BUTTON := true
 BOARD_SUPPRESS_EMMC_WIPE := true
-TARGET_RECOVERY_FSTAB := device/samsung/espresso/rootdir/etc/fstab.tab2
-TARGET_RECOVERY_DEVICE_DIRS += device/samsung/espresso
+TARGET_RECOVERY_FSTAB := device/samsung/espressowifi/rootdir/etc/fstab.tab2
+TARGET_RECOVERY_DEVICE_DIRS += device/samsung/espressowifi
 RECOVERY_FSTAB_VERSION := 2
 BOARD_HAS_DOWNLOAD_MODE := true
diff --git a/aosp_espresso.mk b/aosp_espressowifi.mk
index 36ac5e2..45c91b1 100644
--- a/aosp_espresso.mk
+++ b/aosp_espressowifi.mk
@@ -25,10 +25,10 @@ PRODUCT_PROPERTY_OVERRIDES += \
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
 
 # Inherit device configuration
-$(call inherit-product, device/samsung/espresso/device.mk)
+$(call inherit-product, device/samsung/espressowifi/device.mk)
 
-PRODUCT_NAME := aosp_espresso
-PRODUCT_DEVICE := espresso
+PRODUCT_NAME := aosp_espressowifi
+PRODUCT_DEVICE := espressowifi
 PRODUCT_BRAND := Android
 PRODUCT_MODEL := Galaxy Tab 2
 PRODUCT_MANUFACTURER := Samsung
diff --git a/cm.mk b/cm.mk
index efd9a9e..36d6ab9 100644
--- a/cm.mk
+++ b/cm.mk
@@ -22,10 +22,10 @@ TARGET_SCREEN_WIDTH := 600
 $(call inherit-product, vendor/cm/config/common_full_tablet_wifionly.mk)
 
 # CyanogenMod specific overlay
-DEVICE_PACKAGE_OVERLAYS += device/samsung/espresso/overlay/cm-common
+DEVICE_PACKAGE_OVERLAYS += device/samsung/espressowifi/overlay/cm-common
 
 # Inherit device configuration
-$(call inherit-product, device/samsung/espresso/aosp_espresso.mk)
+$(call inherit-product, device/samsung/espressowifi/aosp_espressowifi.mk)
 
 # Device identifier. This must come after all inclusions
-PRODUCT_NAME := cm_espresso
+PRODUCT_NAME := cm_espressowifi
diff --git a/device.mk b/device.mk
index e47e5f1..bd22354 100644
--- a/device.mk
+++ b/device.mk
@@ -15,16 +15,16 @@
 #
 
 # Include common device configuration
-$(call inherit-product, device/samsung/espresso/espresso-common.mk)
+$(call inherit-product, device/samsung/espressowifi/espresso-common.mk)
 
 # Include wifi-only overlays
-DEVICE_PACKAGE_OVERLAYS += device/samsung/espresso/overlay/aosp
+DEVICE_PACKAGE_OVERLAYS += device/samsung/espressowifi/overlay/aosp
 
 # Audio
 PRODUCT_COPY_FILES += \
-    device/samsung/espresso/audio/audio_policy.conf:system/etc/audio_policy.conf \
-    device/samsung/espresso/audio/tiny_hw_espressowifi.xml:system/etc/sound/espressowifi \
-    device/samsung/espresso/audio/tiny_hw_espresso10wifi.xml:system/etc/sound/espresso10wifi
+    device/samsung/espressowifi/audio/audio_policy.conf:system/etc/audio_policy.conf \
+    device/samsung/espressowifi/audio/tiny_hw_espressowifi.xml:system/etc/sound/espressowifi \
+    device/samsung/espressowifi/audio/tiny_hw_espresso10wifi.xml:system/etc/sound/espresso10wifi
 
 # IR
 PRODUCT_PACKAGES += \
diff --git a/espresso-common.mk b/espresso-common.mk
index 8832725..3c01fb1 100644
--- a/espresso-common.mk
+++ b/espresso-common.mk
@@ -17,11 +17,11 @@
 # Include common omap4 makefile
 $(call inherit-product, hardware/ti/omap4/omap4.mk)
 
-DEVICE_PACKAGE_OVERLAYS += device/samsung/espresso/overlay/aosp-common
+DEVICE_PACKAGE_OVERLAYS += device/samsung/espressowifi/overlay/aosp-common
 
 $(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk)
 
-LOCAL_PATH := device/samsung/espresso
+LOCAL_PATH := device/samsung/espressowifi
 
 # Enable higher-res drawables while keeping mdpi as primary source
 PRODUCT_AAPT_CONFIG := large
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 854fbc8..3a2e91d 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -1 +1 @@
-add_lunch_combo cm_espresso-userdebug
+add_lunch_combo cm_espressowifi-userdebug