From d81eb38a0e0e97e1d0095fef42187cbfe5ed32a9 Mon Sep 17 00:00:00 2001 From: Sipun Ku Mahanta Date: Sat, 24 Jul 2021 12:40:30 +0530 Subject: [PATCH] whyred: Superior Bringup Signed-off-by: Sipun Ku Mahanta Change-Id: I39cd58076a0a7644df4427f56e9cae4d1445316e --- AndroidProducts.mk | 8 +++---- BoardConfig.mk | 4 ++-- device.mk | 2 +- .../core/res/res/values/custom_config.xml | 0 superior.dependencies | 24 +++++++++++++++++++ aosp_whyred.mk => superior_whyred.mk | 13 ++++------ 6 files changed, 35 insertions(+), 16 deletions(-) rename {overlay-pe => overlay-superior}/frameworks/base/core/res/res/values/custom_config.xml (100%) create mode 100644 superior.dependencies rename aosp_whyred.mk => superior_whyred.mk (70%) diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 2071f08f..6605f032 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -5,9 +5,9 @@ # PRODUCT_MAKEFILES := \ - $(LOCAL_DIR)/aosp_whyred.mk + $(LOCAL_DIR)/superior_whyred.mk COMMON_LUNCH_CHOICES := \ - aosp_whyred-user \ - aosp_whyred-userdebug \ - aosp_whyred-eng + superior_whyred-user \ + superior_whyred-userdebug \ + superior_whyred-eng diff --git a/BoardConfig.mk b/BoardConfig.mk index 1d9efa96..4e66d974 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -14,11 +14,11 @@ TARGET_SCREEN_HEIGHT := 2160 TARGET_SCREEN_WIDTH := 1080 # Display -TARGET_SCREEN_DENSITY := 440 +TARGET_SCREEN_DENSITY := 420 # Kernel TARGET_KERNEL_SOURCE := kernel/xiaomi/whyred -TARGET_KERNEL_CONFIG := whyred_defconfig +TARGET_KERNEL_CONFIG := whyred-oldcam_defconfig # Manifest DEVICE_MANIFEST_FILE += $(DEVICE_PATH)/manifest.xml diff --git a/device.mk b/device.mk index 63b51b15..bb3755ff 100644 --- a/device.mk +++ b/device.mk @@ -36,7 +36,7 @@ PRODUCT_PACKAGES += \ # Overlays DEVICE_PACKAGE_OVERLAYS += \ $(DEVICE_PATH)/overlay \ - $(DEVICE_PATH)/overlay-pe + $(DEVICE_PATH)/overlay-superior # Powerhint EAS_POWERHINT_VARIANT := sdm636 diff --git a/overlay-pe/frameworks/base/core/res/res/values/custom_config.xml b/overlay-superior/frameworks/base/core/res/res/values/custom_config.xml similarity index 100% rename from overlay-pe/frameworks/base/core/res/res/values/custom_config.xml rename to overlay-superior/frameworks/base/core/res/res/values/custom_config.xml diff --git a/superior.dependencies b/superior.dependencies new file mode 100644 index 00000000..eb94edb6 --- /dev/null +++ b/superior.dependencies @@ -0,0 +1,24 @@ +[ + { + "repository":"device_xiaomi_whyred-common", + "target_path":"device/xiaomi/sdm660-common" + }, + { + "repository":"kernel_xiaomi_whyred", + "target_path":"kernel/xiaomi/whyred" + }, + { + "repository":"vendor_xiaomi_whyred", + "target_path":"vendor/xiaomi/whyred" + }, + { + "repository":"vendor_xiaomi_whyred-common", + "target_path":"vendor/xiaomi/sdm660-common" + }, + { + "repository":"Darkstar085/vendor_xiaomi_MiuiCamera", + "target_path":"vendor/MiuiCamera", + "branch":"eleven", + "remote":"github" + } +] \ No newline at end of file diff --git a/aosp_whyred.mk b/superior_whyred.mk similarity index 70% rename from aosp_whyred.mk rename to superior_whyred.mk index 45bc6e29..c7baad7f 100644 --- a/aosp_whyred.mk +++ b/superior_whyred.mk @@ -9,14 +9,8 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/product_launched_with_o_mr1.mk) -# Inherit some common PixelExperience stuff. -$(call inherit-product, vendor/aosp/config/common_full_phone.mk) - -# PixelExperience Properties -TARGET_INCLUDE_WIFI_EXT := true -TARGET_GAPPS_ARCH := arm64 -TARGET_BOOT_ANIMATION_RES := 1080 -TARGET_INCLUDE_LIVE_WALLPAPERS := false +# Inherit some common superior stuff +$(call inherit-product, vendor/superior/config/common.mk) # Inherit from whyred device $(call inherit-product, $(LOCAL_PATH)/device.mk) @@ -27,9 +21,10 @@ $(call inherit-product, vendor/MiuiCamera/config.mk) PRODUCT_BRAND := Xiaomi PRODUCT_DEVICE := whyred PRODUCT_MANUFACTURER := Xiaomi -PRODUCT_NAME := aosp_whyred +PRODUCT_NAME := superior_whyred PRODUCT_MODEL := Redmi Note 5 PRODUCT_GMS_CLIENTID_BASE := android-xiaomi TARGET_VENDOR_PRODUCT_NAME := whyred +TARGET_BOOT_ANIMATION_RES := 1080 \ No newline at end of file