From ca5f9ba09609f2106bd21a38d2f41fd80a33a2df Mon Sep 17 00:00:00 2001 From: Vachounet Date: Wed, 20 Sep 2017 13:42:38 +0200 Subject: [PATCH] sanders: potter -> sanders --- Android.mk | 4 ++-- BoardConfig.mk | 12 ++++++------ README.md | 6 +++--- extract-files.sh | 4 ++-- full_potter.mk => full_sanders.mk | 6 +++--- init/Android.mk | 4 ++-- init/{init_potter.cpp => init_sanders.cpp} | 13 ------------- lineage.mk | 14 +++++++------- proprietary-files.txt | 2 +- setup-makefiles.sh | 4 ++-- system.prop | 2 +- 11 files changed, 29 insertions(+), 42 deletions(-) rename full_potter.mk => full_sanders.mk (85%) rename init/{init_potter.cpp => init_sanders.cpp} (90%) diff --git a/Android.mk b/Android.mk index d6c5c01..5b3c6b9 100644 --- a/Android.mk +++ b/Android.mk @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -ifneq ($(filter potter,$(TARGET_DEVICE)),) +ifneq ($(filter sanders,$(TARGET_DEVICE)),) LOCAL_PATH := $(call my-dir) @@ -100,4 +100,4 @@ ALL_DEFAULT_INSTALLED_MODULES += $(FIRMWARE_WIDEVINE_SYMLINKS) include $(call all-makefiles-under,$(LOCAL_PATH)) -endif \ No newline at end of file +endif diff --git a/BoardConfig.mk b/BoardConfig.mk index 664c7a8..e76483e 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -14,9 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. --include vendor/motorola/potter/BoardConfigVendor.mk +-include vendor/motorola/sanders/BoardConfigVendor.mk -DEVICE_PATH := device/motorola/potter +DEVICE_PATH := device/motorola/sanders BOARD_VENDOR := motorola-qcom @@ -38,11 +38,11 @@ TARGET_CPU_ABI2 := armeabi TARGET_CPU_VARIANT := cortex-a53 # Asserts -TARGET_OTA_ASSERT_DEVICE := potter,potter_retail +TARGET_OTA_ASSERT_DEVICE := sanders,sanders_retail # Init -TARGET_INIT_VENDOR_LIB := libinit_potter -TARGET_RECOVERY_DEVICE_MODULES := libinit_potter +TARGET_INIT_VENDOR_LIB := libinit_sanders +TARGET_RECOVERY_DEVICE_MODULES := libinit_sanders # Kernel BOARD_KERNEL_CMDLINE := console=ttyHSL0,115200,n8 androidboot.console=ttyHSL0 androidboot.hardware=qcom user_debug=30 msm_rtb.filter=0x237 @@ -54,7 +54,7 @@ TARGET_CUSTOM_DTBTOOL := dtbTool_custom BOARD_DTBTOOL_ARGS := --force-v3 --motorola 1 BOARD_MKBOOTIMG_ARGS := --ramdisk_offset 0x01000000 --tags_offset 0x00000100 TARGET_KERNEL_ARCH := arm -TARGET_KERNEL_CONFIG := potter_defconfig +TARGET_KERNEL_CONFIG := sanders_defconfig TARGET_KERNEL_SOURCE := kernel/motorola/msm8953 # Audio diff --git a/README.md b/README.md index 6a4267e..c3f1548 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -Device Tree for Moto G5 Plus (potter) +Device Tree for Moto G5S Plus (sanders) =========================================== -The Motorola Moto G5 Plus (codenamed _"potter"_) is a mid-range smartphone from Motorola mobility. +The Motorola Moto G5S Plus (codenamed _"sanders"_) is a mid-range smartphone from Motorola mobility. It was announced on February 2017. Basic | Spec Sheet @@ -19,4 +19,4 @@ Camera | 12 MP, 2150 x 1440 pixels, laser focus, dual flash LED Copyright 2017 - The LineageOS Project. -![Moto G5 Plus](http://cdn2.gsmarena.com/vv/pics/motorola/motorola-moto-g5-plus-1.jpg "Moto G5 Plus") \ No newline at end of file +![Moto G5 Plus](http://cdn2.gsmarena.com/vv/pics/motorola/motorola-moto-g5-plus-1.jpg "Moto G5 Plus") diff --git a/extract-files.sh b/extract-files.sh index 24e00ca..aa3545f 100644 --- a/extract-files.sh +++ b/extract-files.sh @@ -17,7 +17,7 @@ set -e -DEVICE=potter +DEVICE=sanders VENDOR=motorola # Load extractutils and do some sanity checks @@ -54,4 +54,4 @@ setup_vendor "$DEVICE" "$VENDOR" "$CM_ROOT" extract "$MY_DIR"/proprietary-files.txt "$SRC" -"$MY_DIR"/setup-makefiles.sh \ No newline at end of file +"$MY_DIR"/setup-makefiles.sh diff --git a/full_potter.mk b/full_sanders.mk similarity index 85% rename from full_potter.mk rename to full_sanders.mk index df44007..b27aa35 100644 --- a/full_potter.mk +++ b/full_sanders.mk @@ -15,8 +15,8 @@ # # Inherit from potter device -$(call inherit-product, device/motorola/potter/device.mk) +$(call inherit-product, device/motorola/sanders/device.mk) # Device identifier. This must come after all inclusions -PRODUCT_DEVICE := potter -PRODUCT_NAME := full_potter +PRODUCT_DEVICE := sanders +PRODUCT_NAME := full_sanders diff --git a/init/Android.mk b/init/Android.mk index f3f0053..1f633d2 100644 --- a/init/Android.mk +++ b/init/Android.mk @@ -5,8 +5,8 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := system/core/init LOCAL_CPPFLAGS := -Wall -DANDROID_TARGET=\"$(TARGET_BOARD_PLATFORM)\" -LOCAL_SRC_FILES := init_potter.cpp -LOCAL_MODULE := libinit_potter +LOCAL_SRC_FILES := init_sanders.cpp +LOCAL_MODULE := libinit_sanders LOCAL_STATIC_LIBRARIES := \ libbase diff --git a/init/init_potter.cpp b/init/init_sanders.cpp similarity index 90% rename from init/init_potter.cpp rename to init/init_sanders.cpp index 1b254f2..954ad49 100644 --- a/init/init_potter.cpp +++ b/init/init_sanders.cpp @@ -77,17 +77,4 @@ void vendor_load_properties() property_set("ro.hw.fps", "true"); num_sims(); - - if (sku == "XT1687") { - property_set("ro.hw.ecompass", "true"); - property_set("ro.hw.nfc", "false"); - } - else { - property_set("ro.hw.ecompass", "false"); - property_set("ro.hw.nfc", "true"); - } - - if (sku == "XT1683") { - property_set("ro.hw.dtv", "true"); - } } diff --git a/lineage.mk b/lineage.mk index 0fb8ce4..ac539ab 100644 --- a/lineage.mk +++ b/lineage.mk @@ -16,11 +16,11 @@ # Inherit from those products. Most specific first. -$(call inherit-product, device/motorola/potter/full_potter.mk) +$(call inherit-product, device/motorola/sanders/full_potter.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) # for specific -$(call inherit-product, vendor/motorola/potter/potter-vendor.mk) +$(call inherit-product, vendor/motorola/sanders/potter-vendor.mk) # Inherit some common CM stuff. $(call inherit-product, vendor/lineage/config/common_full_phone.mk) @@ -30,14 +30,14 @@ TARGET_SCREEN_WIDTH := 1080 TARGET_SCREEN_HEIGHT := 1920 ## Device identifier. This must come after all inclusions -PRODUCT_DEVICE := potter -PRODUCT_NAME := lineage_potter +PRODUCT_DEVICE := sanders +PRODUCT_NAME := lineage_sanders PRODUCT_BRAND := motorola PRODUCT_MANUFACTURER := motorola PRODUCT_SYSTEM_PROPERTY_BLACKLIST := ro.product.model PRODUCT_BUILD_PROP_OVERRIDES += \ - BUILD_FINGERPRINT=motorola/potter/potter:7.0/NPN25.137-67/75:user/release-keys \ - PRIVATE_BUILD_DESC="potter-7.0/NPN25.137-67/75:user/release-keys" \ - PRODUCT_NAME="Moto G5 Plus" + BUILD_FINGERPRINT=motorola/sanders/sanders:7.1.1/NPS26.116-26/30:user/release-keys \ + PRIVATE_BUILD_DESC="sanders-7.1.1/NPS26.116-26/30:user/release-keys" \ + PRODUCT_NAME="Moto G5S Plus" diff --git a/proprietary-files.txt b/proprietary-files.txt index 2838af5..f77993d 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -1,4 +1,4 @@ -# Proprietary files for potter +# Proprietary files for sanders -app/datastatusnotification/datastatusnotification.apk -app/embms/embms.apk diff --git a/setup-makefiles.sh b/setup-makefiles.sh index efdfdb5..8771eec 100644 --- a/setup-makefiles.sh +++ b/setup-makefiles.sh @@ -18,7 +18,7 @@ set -e # Required! -DEVICE=potter +DEVICE=sanders VENDOR=motorola # Load extractutils and do some sanity checks @@ -44,4 +44,4 @@ write_headers write_makefiles "$MY_DIR"/proprietary-files.txt # We are done! -write_footers \ No newline at end of file +write_footers diff --git a/system.prop b/system.prop index 8011d1a..03f963b 100644 --- a/system.prop +++ b/system.prop @@ -1,5 +1,5 @@ # -# system.prop for potter +# system.prop for sanders # # Android Run Time