Skip to content

Commit

Permalink
tomato: Rename to tomato
Browse files Browse the repository at this point in the history
  • Loading branch information
intervigilium committed Oct 2, 2014
1 parent 0e5887d commit 16f813a
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion Android.mk
Expand Up @@ -15,7 +15,7 @@

LOCAL_PATH := $(call my-dir)

ifeq ($(TARGET_DEVICE),cp8675)
ifeq ($(TARGET_DEVICE),tomato)

include $(call all-makefiles-under,$(LOCAL_PATH))

Expand Down
2 changes: 1 addition & 1 deletion AndroidProducts.mk
Expand Up @@ -14,4 +14,4 @@
# limitations under the License.

PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/full_cp8675.mk
$(LOCAL_DIR)/full_tomato.mk
10 changes: 5 additions & 5 deletions BoardConfig.mk
Expand Up @@ -14,11 +14,11 @@
# limitations under the License.

# inherit from the proprietary version
-include vendor/qrd/cp8675/BoardConfigVendor.mk
-include vendor/micromax/tomato/BoardConfigVendor.mk

LOCAL_PATH := device/qrd/cp8675
LOCAL_PATH := device/micromax/tomato

BOARD_VENDOR := coolpad
BOARD_VENDOR := micromax

TARGET_SPECIFIC_HEADER_PATH := $(LOCAL_PATH)/include

Expand All @@ -45,8 +45,8 @@ BOARD_KERNEL_BASE := 0x80000000
BOARD_KERNEL_PAGESIZE := 2048
BOARD_KERNEL_SEPARATED_DT := true
BOARD_MKBOOTIMG_ARGS := --ramdisk_offset 0x02000000 --dt $(LOCAL_PATH)/dt.img
TARGET_KERNEL_SOURCE := kernel/qrd/msm8916
TARGET_KERNEL_CONFIG := cp8675_defconfig
TARGET_KERNEL_SOURCE := kernel/micromax/msm8916
TARGET_KERNEL_CONFIG := cyanogenmod_cp8675_defconfig

# Audio
BOARD_USES_ALSA_AUDIO := true
Expand Down
4 changes: 2 additions & 2 deletions cm.mk
@@ -1,4 +1,4 @@
$(call inherit-product, device/qrd/cp8675/full_cp8675.mk)
$(call inherit-product, device/micromax/tomato/full_tomato.mk)

# Inherit some common CM stuff.
$(call inherit-product, vendor/cm/config/common_full_phone.mk)
Expand All @@ -7,4 +7,4 @@ $(call inherit-product, vendor/cm/config/common_full_phone.mk)
$(call inherit-product, vendor/cm/config/nfc_enhanced.mk)

PRODUCT_RELEASE_NAME := Coolpad 8675
PRODUCT_NAME := cm_cp8675
PRODUCT_NAME := cm_tomato
2 changes: 1 addition & 1 deletion device.mk
Expand Up @@ -16,7 +16,7 @@

$(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk)

$(call inherit-product, vendor/qrd/cp8675/cp8675-vendor.mk)
$(call inherit-product, vendor/micromax/tomato/tomato-vendor.mk)

# Overlay
DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
Expand Down
4 changes: 2 additions & 2 deletions extract-files.sh
@@ -1,8 +1,8 @@
#!/bin/bash

#set -e
export DEVICE=cp8675
export VENDOR=qrd
export DEVICE=tomato
export VENDOR=micromax

if [ $# -eq 0 ]; then
SRC=adb
Expand Down
12 changes: 6 additions & 6 deletions full_cp8675.mk → full_tomato.mk
Expand Up @@ -17,12 +17,12 @@
# Inherit from those products. Most specific first.
$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)

# Inherit from cp8675 device
$(call inherit-product, device/qrd/cp8675/device.mk)
# Inherit from tomato device
$(call inherit-product, device/micromax/tomato/device.mk)

# Device identifier. This must come after all inclusions
PRODUCT_DEVICE := cp8675
PRODUCT_NAME := full_cp8675
PRODUCT_BRAND := qrd
PRODUCT_DEVICE := tomato
PRODUCT_NAME := full_tomato
PRODUCT_BRAND := micromax
PRODUCT_MODEL := cp8675
PRODUCT_MANUFACTURER := qrd
PRODUCT_MANUFACTURER := Micromax
2 changes: 1 addition & 1 deletion proprietary-files.txt
@@ -1 +1 @@
# Proprietary files for cp8675
# Proprietary files for tomato
6 changes: 3 additions & 3 deletions setup-makefiles.sh
@@ -1,7 +1,7 @@
#!/bin/bash

DEVICE=cp8675
VENDOR=qrd
DEVICE=tomato
VENDOR=micromax

OUTDIR=vendor/$VENDOR/$DEVICE
MAKEFILE=../../../$OUTDIR/$DEVICE-vendor-blobs.mk
Expand Down Expand Up @@ -112,7 +112,7 @@ EOF
LOCAL_PATH := \$(call my-dir)
ifeq (\$(TARGET_DEVICE),cp8675)
ifeq (\$(TARGET_DEVICE),tomato)
include \$(CLEAR_VARS)
LOCAL_MODULE := com.qualcomm.location
Expand Down

0 comments on commit 16f813a

Please sign in to comment.