From 6caf884b3c12ead4c43939ca74989e43e7eaab80 Mon Sep 17 00:00:00 2001 From: Dan Pasanen Date: Mon, 3 Nov 2014 12:14:14 -0600 Subject: [PATCH] d855: initial setup Change-Id: Ia47d9ee0f5dae939922882d263f3f998c84e4441 --- Android.mk | 2 +- BoardConfig.mk | 10 +- README.md | 4 +- bluetooth/bdroid_buildcfg.h | 2 +- cm.mk | 12 +- device.mk | 2 +- extract-files.sh | 2 +- full_vs985.mk => full_d855.mk | 10 +- .../frameworks/base/core/res/res/xml/eri.xml | 167 ------------------ setup-makefiles.sh | 2 +- vendorsetup.sh | 2 +- 11 files changed, 23 insertions(+), 192 deletions(-) rename full_vs985.mk => full_d855.mk (84%) delete mode 100644 overlay/frameworks/base/core/res/res/xml/eri.xml diff --git a/Android.mk b/Android.mk index 6aceb21..135981c 100644 --- a/Android.mk +++ b/Android.mk @@ -25,7 +25,7 @@ LOCAL_PATH := $(call my-dir) -ifneq ($(filter vs985,$(TARGET_DEVICE)),) +ifneq ($(filter d855,$(TARGET_DEVICE)),) include $(call all-makefiles-under,$(LOCAL_PATH)) WCNSS_IMAGES := \ diff --git a/BoardConfig.mk b/BoardConfig.mk index 80bbe1d..07aaff7 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -17,15 +17,15 @@ # inherit from common g3 -include device/lge/g3-common/BoardConfigCommon.mk -TARGET_OTA_ASSERT_DEVICE := g3,vs985 +TARGET_OTA_ASSERT_DEVICE := g3,d855 # Bluetooth BOARD_HAVE_BLUETOOTH_QCOM := true BLUETOOTH_HCI_USE_MCT := true -BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/lge/vs985/bluetooth +BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/lge/d855/bluetooth # Kernel -TARGET_KERNEL_CONFIG := cyanogenmod_vs985_defconfig +TARGET_KERNEL_CONFIG := cyanogenmod_d855_defconfig # Partitions BOARD_BOOTIMAGE_PARTITION_SIZE := 16777216 @@ -34,7 +34,7 @@ BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2692743168 BOARD_USERDATAIMAGE_PARTITION_SIZE := 27325360128 # Recovery -TARGET_RECOVERY_FSTAB := device/lge/vs985/rootdir/etc/fstab.g3 +TARGET_RECOVERY_FSTAB := device/lge/d855/rootdir/etc/fstab.g3 # Wifi BOARD_HAS_QCOM_WLAN := true @@ -49,4 +49,4 @@ WIFI_DRIVER_FW_PATH_STA := "sta" WPA_SUPPLICANT_VERSION := VER_0_8_X # inherit from the proprietary version --include vendor/lge/vs985/BoardConfigVendor.mk +-include vendor/lge/d855/BoardConfigVendor.mk diff --git a/README.md b/README.md index 29116b7..e450aa1 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ Copyright 2014 - The CyanogenMod Project -Device configuration for LGE G3 (VZW) +Device configuration for LGE G3 (International) ===================================== Basic | Spec Sheet @@ -19,4 +19,4 @@ Camera | 13 MP, 4160 x 3120 pixels Release Date | July 2014 -![LG G3 VS985](http://i.imgur.com/sYNKEHq.jpg "LG G3 VS985") +![LG G3 D855](http://i.imgur.com/sYNKEHq.jpg "LG G3 D855") diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h index c21ded7..3961861 100644 --- a/bluetooth/bdroid_buildcfg.h +++ b/bluetooth/bdroid_buildcfg.h @@ -19,7 +19,7 @@ #define BLUETOOTH_QCOM_SW TRUE -#define BTM_DEF_LOCAL_NAME "LG G3 VS985" +#define BTM_DEF_LOCAL_NAME "LG G3 D855" // Disables read remote device feature #define BTA_SKIP_BLE_READ_REMOTE_FEAT TRUE #define MAX_L2CAP_CHANNELS 14 diff --git a/cm.mk b/cm.mk index c4c9417..501b9c1 100644 --- a/cm.mk +++ b/cm.mk @@ -1,4 +1,4 @@ -$(call inherit-product, device/lge/vs985/full_vs985.mk) +$(call inherit-product, device/lge/d855/full_d855.mk) # Inherit some common CM stuff. $(call inherit-product, vendor/cm/config/common_full_phone.mk) @@ -6,12 +6,10 @@ $(call inherit-product, vendor/cm/config/common_full_phone.mk) # Enhanced NFC $(call inherit-product, vendor/cm/config/nfc_enhanced.mk) -PRODUCT_NAME := cm_vs985 +PRODUCT_NAME := cm_d855 PRODUCT_BUILD_PROP_OVERRIDES += \ PRODUCT_DEVICE="g3" \ - PRODUCT_NAME="g3_vzw_us" \ - BUILD_FINGERPRINT="lge/g3_vzw/g3:4.4.2/KVT49L.VS98510B/VS98510B.1403785622:user/release-keys" \ - PRIVATE_BUILD_DESC="g3_vzw-user 4.4.2 KVT49L.VS98510B VS98510B.1403785622 release-keys" - -PRODUCT_GMS_CLIENTID_BASE := android-verizon + PRODUCT_NAME="g3_global_com" \ + BUILD_FINGERPRINT="lge/g3_global_com/g3:4.4.2/KVT49L.A1404795316/1404795316:user/release-keys" \ + PRIVATE_BUILD_DESC="g3_global_com-user 4.4.2 KVT49L.A1404795316 1404795316 release-keys" diff --git a/device.mk b/device.mk index 5ef22c7..fb9baed 100644 --- a/device.mk +++ b/device.mk @@ -17,7 +17,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk) # Get non-open-source specific aspects -$(call inherit-product-if-exists, vendor/lge/vs985/vs985-vendor.mk) +$(call inherit-product-if-exists, vendor/lge/d855/d855-vendor.mk) # Overlays DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay diff --git a/extract-files.sh b/extract-files.sh index 6114935..9bc06ed 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -3,5 +3,5 @@ set -e export VENDOR=lge -export DEVICE=vs985 +export DEVICE=d855 ./../../$VENDOR/g3-common/extract-files.sh $@ diff --git a/full_vs985.mk b/full_d855.mk similarity index 84% rename from full_vs985.mk rename to full_d855.mk index dbe97c3..074ea7e 100644 --- a/full_vs985.mk +++ b/full_d855.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 vs985 device -$(call inherit-product, device/lge/vs985/device.mk) +# Inherit from d855 device +$(call inherit-product, device/lge/d855/device.mk) # Set those variables here to overwrite the inherited values. -PRODUCT_DEVICE := vs985 -PRODUCT_NAME := full_vs985 +PRODUCT_DEVICE := d855 +PRODUCT_NAME := full_d855 PRODUCT_BRAND := lge -PRODUCT_MODEL := LG-VS985 +PRODUCT_MODEL := LG-D855 PRODUCT_MANUFACTURER := LGE diff --git a/overlay/frameworks/base/core/res/res/xml/eri.xml b/overlay/frameworks/base/core/res/res/xml/eri.xml deleted file mode 100644 index 7eaa431..0000000 --- a/overlay/frameworks/base/core/res/res/xml/eri.xml +++ /dev/null @@ -1,167 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/setup-makefiles.sh b/setup-makefiles.sh index d35e865..e923d79 100755 --- a/setup-makefiles.sh +++ b/setup-makefiles.sh @@ -3,5 +3,5 @@ set -e export VENDOR=lge -export DEVICE=vs985 +export DEVICE=d855 ./../../$VENDOR/g3-common/setup-makefiles.sh $@ diff --git a/vendorsetup.sh b/vendorsetup.sh index edbc36a..4957da1 100755 --- a/vendorsetup.sh +++ b/vendorsetup.sh @@ -1 +1 @@ -add_lunch_combo cm_vs985-userdebug +add_lunch_combo cm_d855-userdebug