From 16f813a43696ae7cd5a983e15d64021891877739 Mon Sep 17 00:00:00 2001 From: Ethan Chen Date: Thu, 2 Oct 2014 15:40:29 -0700 Subject: [PATCH] tomato: Rename to tomato --- Android.mk | 2 +- AndroidProducts.mk | 2 +- BoardConfig.mk | 10 +++++----- cm.mk | 4 ++-- device.mk | 2 +- extract-files.sh | 4 ++-- full_cp8675.mk => full_tomato.mk | 12 ++++++------ proprietary-files.txt | 2 +- setup-makefiles.sh | 6 +++--- 9 files changed, 22 insertions(+), 22 deletions(-) rename full_cp8675.mk => full_tomato.mk (80%) diff --git a/Android.mk b/Android.mk index fa4cb2d9..f2375b0f 100644 --- a/Android.mk +++ b/Android.mk @@ -15,7 +15,7 @@ LOCAL_PATH := $(call my-dir) -ifeq ($(TARGET_DEVICE),cp8675) +ifeq ($(TARGET_DEVICE),tomato) include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 78a4fa93..db596333 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -14,4 +14,4 @@ # limitations under the License. PRODUCT_MAKEFILES := \ - $(LOCAL_DIR)/full_cp8675.mk + $(LOCAL_DIR)/full_tomato.mk diff --git a/BoardConfig.mk b/BoardConfig.mk index fa2e34fd..d1d7388f 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -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 @@ -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 diff --git a/cm.mk b/cm.mk index a6fee2e0..7f0697da 100644 --- a/cm.mk +++ b/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) @@ -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 diff --git a/device.mk b/device.mk index b3c1bbc3..8269e0c3 100644 --- a/device.mk +++ b/device.mk @@ -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 diff --git a/extract-files.sh b/extract-files.sh index adeaf624..f1e0f51f 100755 --- a/extract-files.sh +++ b/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 diff --git a/full_cp8675.mk b/full_tomato.mk similarity index 80% rename from full_cp8675.mk rename to full_tomato.mk index 5cf84e7d..89a882d5 100644 --- a/full_cp8675.mk +++ b/full_tomato.mk @@ -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 diff --git a/proprietary-files.txt b/proprietary-files.txt index ded82adf..4f2b78b8 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -1 +1 @@ -# Proprietary files for cp8675 +# Proprietary files for tomato diff --git a/setup-makefiles.sh b/setup-makefiles.sh index 40f3558d..58bee211 100755 --- a/setup-makefiles.sh +++ b/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 @@ -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