Skip to content

Commit 656d58e

Browse files
AmulyaXramabondanp
authored andcommitted
lavender: Changes for lavender
Signed-off-by: AmulyaX <[email protected]>
1 parent 9a62faf commit 656d58e

23 files changed

+55
-2654
lines changed

Android.bp

-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
subdirs = [
22
"*"
33
]
4-
soong_namespace {
5-
imports: ["hardware/qcom/bootctrl"],
6-
}

Android.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
LOCAL_PATH := $(call my-dir)
2525

26-
ifeq ($(TARGET_DEVICE),jasmine_sprout)
26+
ifeq ($(TARGET_DEVICE),lavender)
2727
subdir_makefiles=$(call first-makefiles-under,$(LOCAL_PATH))
2828
$(foreach mk,$(subdir_makefiles),$(info including $(mk) ...)$(eval include $(mk)))
2929

AndroidProducts.mk

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323

2424
# inherit MI A2 lineage device config
2525
PRODUCT_MAKEFILES := \
26-
$(LOCAL_DIR)/lineage_jasmine_sprout.mk
26+
$(LOCAL_DIR)/lineage_lavender.mk
2727

2828
COMMON_LUNCH_CHOICES := \
29-
lineage_jasmine_sprout-eng \
30-
lineage_jasmine_sprout-userdebug \
31-
lineage_jasmine_sprout-eng
29+
lineage_lavender-eng \
30+
lineage_lavender-userdebug \
31+
lineage_lavender-user

BoardConfig.mk

+4-15
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,14 @@
2424
include device/xiaomi/sdm660-common/BoardConfigCommon.mk
2525

2626
# Device Path
27-
DEVICE_PATH := device/xiaomi/jasmine_sprout
28-
29-
# A/B
30-
AB_OTA_UPDATER := true
31-
BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
32-
BOARD_USES_RECOVERY_AS_BOOT := true
33-
TARGET_NO_RECOVERY := true
27+
DEVICE_PATH := device/xiaomi/lavender
3428

3529
# DT2W
36-
TARGET_TAP_TO_WAKE_NODE := "/proc/nvt_wake_gesture"
30+
TARGET_TAP_TO_WAKE_NODE := "/proc/tp_gesture"
3731

3832
# Kernel
39-
TARGET_KERNEL_SOURCE := kernel/xiaomi/sdm660
40-
TARGET_KERNEL_CONFIG := jasmine-perf_defconfig
33+
TARGET_KERNEL_SOURCE := kernel/xiaomi/lavender
34+
TARGET_KERNEL_CONFIG := lavender-perf_defconfig
4135

4236
# Manifest
4337
DEVICE_MANIFEST_FILE += $(DEVICE_PATH)/manifest.xml
@@ -50,8 +44,3 @@ VENDOR_SECURITY_PATCH := 2018-06-05
5044

5145
# WLAN MAC
5246
WLAN_MAC_SYMLINK := true
53-
54-
-include device/twrp/jasmine_sprout/twrp.mk
55-
56-
# TWRP Support
57-
include $(DEVICE_PATH)/twrp.mk

README.md

+15-14
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
1-
Copyright (C) 2018 Xiaomi-SDM660 Project
1+
Copyright (C) 2019 Android Open Source Project
22

3-
The MI A2 (codenamed _"jasmine_sprout"_) is a mid-range phone from Xiaomi.
3+
The Redmi Note 7 (codenamed _"lavender"_) is a high-end mid-range smartphone from Xiaomi.
44

5-
Xiaomi MI A2 was announced and released in July 2018.
5+
Xiaomi Redmi Note 7 was announced and released in January 2019.
66

77
## Device specifications
88

9-
| Device | Xiaomi MI A2 |
9+
| Device | Xiaomi Redmi Note 7 |
1010
| -----------: | :---------------------------------------------- |
1111
| SoC | Qualcomm SDM660 Snapdragon 660 |
12-
| CPU | 8x Qualcomm® Kryo™ 260 up to 2.2GHz |
12+
| CPU | 8x Qualcomm® Kryo™ 260 up to 1.8GHz |
1313
| GPU | Adreno 512 |
14-
| Memory | 4GB / 6GB RAM (LPDDR4X) |
15-
| Shipped Android version | 8.1.0 |
16-
| Storage | 32/64/128GB eMMC 5.1 flash storage |
17-
| Battery | Non-removable Li-Po 3010 mAh |
18-
| Dimensions | 158.7 x 75.4 x 7.3 mm |
19-
| Display | 1080x2160 pixels, 5.99 |
20-
Rear Camera | 12MP+20MP, AI Dual Camera
21-
Front Camera | 20 MP
14+
| Memory | 3GB / 4GB RAM (LPDDR4X) |
15+
| Shipped Android version | 9.0.0 |
16+
| Storage | 64GB eMMC 5.1 flash storage |
17+
| Battery | Non-removable Li-Po 4000 mAh |
18+
| Dimensions | 159.21 x 75.21 x 8.1 mm |
19+
| Display | 2340 x 1080 (19.5:9), 6.3 inch |
20+
| Rear camera 1 | 12 MP, f/2.2, (wide), 1/2.9", 1.25µm, PDAF (Indian) or 48 MP, f/1.8, (wide), 1/2", 0.8µm, PDAF (Indian/Global) |
21+
| Rear camera 2 | 2 MP, f/2.4, depth sensor or 5 MP, f/2.2, depth sensor |
22+
| Front camera | 13 MP, f/2.0, 1.12µm|
2223

2324
## Device picture
2425

25-
![Xiaomi MI 6X](https://img.staticbg.com/thumb/large/oaupload/banggood/images/90/CB/781c0a93-de94-4010-86c8-5b9f846f4aa4.jpg "Xiaomi MI A2")
26+
![Xiaomi Redmi Note 7](https://i01.appmifile.com/webfile/globalimg/products/pc/redmi-note7/gallery1-2.jpg)

bootctrl/Android.bp

-20
This file was deleted.

device.mk

+6-56
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
$(call inherit-product, device/xiaomi/sdm660-common/sdm660.mk)
2626

2727
# Device Path
28-
DEVICE_PATH := device/xiaomi/jasmine_sprout
28+
DEVICE_PATH := device/xiaomi/lavender
2929

3030
# Soong
3131
PRODUCT_SOONG_NAMESPACES += \
@@ -35,44 +35,15 @@ PRODUCT_SOONG_NAMESPACES += \
3535
DEVICE_PACKAGE_OVERLAYS += \
3636
$(DEVICE_PATH)/overlay
3737

38-
# A/B
39-
AB_OTA_UPDATER := true
40-
AB_OTA_PARTITIONS += \
41-
boot \
42-
system \
43-
vendor
44-
45-
AB_OTA_POSTINSTALL_CONFIG += \
46-
RUN_POSTINSTALL_system=true \
47-
POSTINSTALL_PATH_system=system/bin/otapreopt_script \
48-
FILESYSTEM_TYPE_system=ext4 \
49-
POSTINSTALL_OPTIONAL_system=true
50-
51-
PRODUCT_PACKAGES += \
52-
otapreopt_script
53-
5438
# Audio
5539
PRODUCT_COPY_FILES += \
5640
$(DEVICE_PATH)/audio/audio_platform_info_intcodec.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_intcodec.xml \
5741
$(DEVICE_PATH)/audio/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml
5842

5943
# Boot animation
60-
TARGET_SCREEN_HEIGHT := 2160
44+
TARGET_SCREEN_HEIGHT := 2340
6145
TARGET_SCREEN_WIDTH := 1080
6246

63-
PRODUCT_CHARACTERISTICS := nosdcard
64-
65-
# Boot control
66-
PRODUCT_PACKAGES += \
67-
68-
69-
bootctrl.sdm660 \
70-
71-
bootctrl.sdm660.recovery
72-
73-
PRODUCT_PACKAGES_DEBUG += \
74-
bootctl
75-
7647
# Consumerir
7748
PRODUCT_PACKAGES += \
7849
@@ -106,38 +77,17 @@ PRODUCT_AAPT_PREF_CONFIG := xxhdpi
10677
PRODUCT_COPY_FILES += \
10778
$(DEVICE_PATH)/sensors/sensor_def_qcomdev.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/sensor_def_qcomdev.conf
10879

109-
# Update engine
110-
PRODUCT_PACKAGES += \
111-
update_engine \
112-
update_engine_sideload \
113-
update_verifier
114-
115-
PRODUCT_HOST_PACKAGES += \
116-
brillo_update_payload
117-
118-
PRODUCT_PACKAGES_DEBUG += \
119-
update_engine_client
120-
12180
# Vibrator
12281
PRODUCT_PACKAGES += \
12382
12483
12584

126-
# Watermark
127-
PRODUCT_COPY_FILES += \
128-
$(DEVICE_PATH)/media/MIUI_DualCamera_watermark_A2.png:$(TARGET_COPY_OUT_VENDOR)/etc/MIUI_DualCamera_watermark.png
129-
130-
# Verity
131-
PRODUCT_SYSTEM_VERITY_PARTITION := /dev/block/platform/soc/c0c4000.sdhci/by-name/system
132-
PRODUCT_VENDOR_VERITY_PARTITION := /dev/block/platform/soc/c0c4000.sdhci/by-name/vendor
133-
$(call inherit-product, build/target/product/verity.mk)
134-
13585
# Vendor files
136-
$(call inherit-product, vendor/xiaomi/wayne/wayne-vendor.mk)
86+
$(call inherit-product, vendor/xiaomi/lavender/lavender-vendor.mk)
13787

13888
# AOSP DEVICE
139-
PRODUCT_NAME := aosp_jasmine_sprout
140-
PRODUCT_DEVICE := jasmine_sprout
141-
PRODUCT_MODEL := Mi A2 (AOSP)
89+
PRODUCT_NAME := aosp_lavender
90+
PRODUCT_DEVICE := lavender
91+
PRODUCT_MODEL := Redmi Note 7 (AOSP)
14292
PRODUCT_BRAND := Xiaomi
14393
PRODUCT_MANUFACTURER := Xiaomi

extract-files.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ fi
2424
set -e
2525

2626
# Required!
27-
export DEVICE=jasmine_sprout
27+
export DEVICE=lavender
2828
export DEVICE_COMMON=sdm660-common
2929
export VENDOR=xiaomi
3030

31-
export DEVICE_BRINGUP_YEAR=2018
31+
export DEVICE_BRINGUP_YEAR=2019
3232

3333
GOODIX="$LINEAGE_ROOT"/vendor/"$VENDOR"/"$DEVICE"/proprietary/vendor/lib64/libgf_ca.so
3434
sed -i "s|/system/etc/firmware|/vendor/firmware\x0\x0\x0\x0|g" $GOODIX

gpt-utils/Android.bp

-37
This file was deleted.

0 commit comments

Comments
 (0)