Skip to content

Commit c87805b

Browse files
adithya2306adithya2306
committed
lettuce: Merge cyanogen_msm8916-common into our device tree
Makes life much easier :D * Also remove the msm8939 power HAL extension which was supposed to be kicked as a part of lettuce-oreo/android_device_cyanogen_msm8916-common@915fb9a Signed-off-by: Ad!thya R <gh0strider.2k18.reborn@gmail.com>
1 parent 26398b0 commit c87805b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+4447
-13
lines changed

‎Android.mk

+110
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,115 @@
1616
LOCAL_PATH := $(call my-dir)
1717

1818
ifeq ($(TARGET_DEVICE),lettuce)
19+
1920
include $(call all-makefiles-under,$(LOCAL_PATH))
21+
22+
include $(CLEAR_VARS)
23+
24+
CMN_IMAGES := \
25+
cmnlib.b00 cmnlib.b01 cmnlib.b02 cmnlib.b03 cmnlib.mdt
26+
27+
CMN_SYMLINKS := $(addprefix $(TARGET_OUT_ETC)/firmware/,$(notdir $(CMN_IMAGES)))
28+
$(CMN_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
29+
@echo "CMN firmware link: $@"
30+
@mkdir -p $(dir $@)
31+
@rm -rf $@
32+
$(hide) ln -sf /firmware/image/$(notdir $@) $@
33+
34+
ALL_DEFAULT_INSTALLED_MODULES += $(CMN_SYMLINKS)
35+
36+
IMS_LIBS := libimscamera_jni.so libimsmedia_jni.so
37+
38+
IMS_SYMLINKS := $(addprefix $(TARGET_OUT_APPS)/ims/lib/arm64/,$(notdir $(IMS_LIBS)))
39+
$(IMS_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
40+
@echo "IMS lib link: $@"
41+
@mkdir -p $(dir $@)
42+
@rm -rf $@
43+
$(hide) ln -sf /system/vendor/lib64/$(notdir $@) $@
44+
45+
ALL_DEFAULT_INSTALLED_MODULES += $(IMS_SYMLINKS)
46+
47+
ISDB_IMAGES := \
48+
isdbtmm.b00 isdbtmm.b01 isdbtmm.b02 isdbtmm.b03 isdbtmm.mdt
49+
50+
ISDB_SYMLINKS := $(addprefix $(TARGET_OUT_ETC)/firmware/,$(notdir $(ISDB_IMAGES)))
51+
$(ISDB_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
52+
@echo "ISDB firmware link: $@"
53+
@mkdir -p $(dir $@)
54+
@rm -rf $@
55+
$(hide) ln -sf /firmware/image/$(notdir $@) $@
56+
57+
ALL_DEFAULT_INSTALLED_MODULES += $(ISDB_SYMLINKS)
58+
59+
KM_IMAGES := \
60+
keymaste.b00 keymaste.b01 keymaste.b02 keymaste.b03 keymaste.mdt
61+
62+
KM_SYMLINKS := $(addprefix $(TARGET_OUT_ETC)/firmware/,$(notdir $(KM_IMAGES)))
63+
$(KM_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
64+
@echo "Keymaster firmware link: $@"
65+
@mkdir -p $(dir $@)
66+
@rm -rf $@
67+
$(hide) ln -sf /firmware/image/$(notdir $@) $@
68+
69+
ALL_DEFAULT_INSTALLED_MODULES += $(KM_SYMLINKS)
70+
71+
MODEM_IMAGES := \
72+
modem.b00 modem.b01 modem.b02 modem.b03 modem.b04 modem.b05 \
73+
modem.b06 modem.b07 modem.b10 modem.b12 modem.b13 modem.b15 \
74+
modem.b16 modem.b17 modem.b18 modem.b19 modem.b20 modem.b21 \
75+
modem.b24 modem.b25 modem.b26 modem.b27 modem.mdt
76+
77+
MODEM_SYMLINKS := $(addprefix $(TARGET_OUT_ETC)/firmware/,$(notdir $(MODEM_IMAGES)))
78+
$(MODEM_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
79+
@echo "Modem firmware link: $@"
80+
@mkdir -p $(dir $@)
81+
@rm -rf $@
82+
$(hide) ln -sf /firmware/image/$(notdir $@) $@
83+
84+
ALL_DEFAULT_INSTALLED_MODULES += $(MODEM_SYMLINKS)
85+
86+
PLAYREADY_IMAGES := \
87+
playread.b00 playread.b01 playread.b02 playread.b03 playread.mdt
88+
89+
PLAYREADY_SYMLINKS := $(addprefix $(TARGET_OUT_ETC)/firmware/,$(notdir $(PLAYREADY_IMAGES)))
90+
$(PLAYREADY_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
91+
@echo "Playready firmware link: $@"
92+
@mkdir -p $(dir $@)
93+
@rm -rf $@
94+
$(hide) ln -sf /firmware/image/$(notdir $@) $@
95+
96+
ALL_DEFAULT_INSTALLED_MODULES += $(PLAYREADY_SYMLINKS)
97+
98+
WCNSS_IMAGES := \
99+
wcnss.b00 wcnss.b01 wcnss.b02 wcnss.b04 wcnss.b06 \
100+
wcnss.b09 wcnss.b10 wcnss.b11 wcnss.mdt
101+
102+
WCNSS_SYMLINKS := $(addprefix $(TARGET_OUT_ETC)/firmware/,$(notdir $(WCNSS_IMAGES)))
103+
$(WCNSS_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
104+
@echo "WCNSS firmware link: $@"
105+
@mkdir -p $(dir $@)
106+
@rm -rf $@
107+
$(hide) ln -sf /firmware/image/$(notdir $@) $@
108+
109+
ALL_DEFAULT_INSTALLED_MODULES += $(WCNSS_SYMLINKS)
110+
111+
WV_IMAGES := \
112+
widevine.b00 widevine.b01 widevine.b02 widevine.b03 widevine.mdt
113+
114+
WV_SYMLINKS := $(addprefix $(TARGET_OUT_ETC)/firmware/,$(notdir $(WV_IMAGES)))
115+
$(WV_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
116+
@echo "Widevine firmware link: $@"
117+
@mkdir -p $(dir $@)
118+
@rm -rf $@
119+
$(hide) ln -sf /firmware/image/$(notdir $@) $@
120+
121+
ALL_DEFAULT_INSTALLED_MODULES += $(WV_SYMLINKS)
122+
123+
WCNSS_CFG_SYMLINK := $(TARGET_OUT_VENDOR)/firmware/wlan/prima/WCNSS_qcom_cfg.ini
124+
$(WCNSS_CFG_SYMLINK): $(LOCAL_INSTALLED_MODULE)
125+
@mkdir -p $(dir $@)
126+
$(hide) ln -sf /data/misc/wifi/$(notdir $@) $@
127+
128+
ALL_DEFAULT_INSTALLED_MODULES += $(WCNSS_CFG_SYMLINK)
129+
20130
endif

‎AndroidBoard.mk

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
LOCAL_PATH := $(call my-dir)
2+
3+
#----------------------------------------------------------------------
4+
# extra images
5+
#----------------------------------------------------------------------
6+
include build/core/generate_extra_images.mk

‎BoardConfig.mk

+123-5
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,47 @@
1515
# limitations under the License.
1616
#
1717

18-
# Inherit from msm8916-common
19-
include device/cyanogen/msm8916-common/BoardConfigCommon.mk
20-
2118
DEVICE_PATH := device/yu/lettuce
2219

20+
# Platform
21+
BOARD_USES_QCOM_HARDWARE := true
22+
TARGET_BOARD_PLATFORM := msm8916
23+
TARGET_BOOTLOADER_BOARD_NAME := MSM8916
24+
TARGET_NO_BOOTLOADER := true
25+
26+
# Architecture
27+
ifneq ($(FORCE_32_BIT),true)
28+
TARGET_ARCH := arm64
29+
TARGET_ARCH_VARIANT := armv8-a
30+
TARGET_CPU_ABI := arm64-v8a
31+
TARGET_CPU_ABI2 :=
32+
TARGET_CPU_VARIANT := cortex-a53
33+
34+
TARGET_2ND_ARCH := arm
35+
TARGET_2ND_ARCH_VARIANT := armv7-a-neon
36+
TARGET_2ND_CPU_ABI := armeabi-v7a
37+
TARGET_2ND_CPU_ABI2 := armeabi
38+
TARGET_2ND_CPU_VARIANT := cortex-a53
39+
else
40+
TARGET_ARCH := arm
41+
TARGET_ARCH_VARIANT := armv7-a-neon
42+
TARGET_CPU_ABI := armeabi-v7a
43+
TARGET_CPU_ABI2 := armeabi
44+
TARGET_CPU_VARIANT := cortex-a53
45+
46+
TARGET_USES_64_BIT_BINDER := true
47+
endif
48+
2349
# Audio
50+
AUDIO_FEATURE_ENABLED_KPI_OPTIMIZE := true
2451
AUDIO_FEATURE_ENABLED_MULTI_VOICE_SESSIONS := true
52+
AUDIO_FEATURE_ENABLED_NEW_SAMPLE_RATE := true
53+
BOARD_USES_ALSA_AUDIO := true
54+
USE_CUSTOM_AUDIO_POLICY := 1
2555

2656
# Bluetooth
2757
BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(DEVICE_PATH)/bluetooth
58+
BOARD_HAVE_BLUETOOTH_QCOM := true
2859

2960
# Boot animation
3061
TARGET_BOOTANIMATION_HALF_RES := true
@@ -37,56 +68,127 @@ BOARD_CAMERA_SENSORS := ov5670_q5v41b ov8865_q8v18a
3768
USE_DEVICE_SPECIFIC_CAMERA := true
3869

3970
# Dex optimizion
71+
ifeq ($(HOST_OS),linux)
72+
ifneq ($(TARGET_BUILD_VARIANT),eng)
73+
WITH_DEXPREOPT := true
74+
WITH_DEXPREOPT_DEBUG_INFO := false
75+
USE_DEX2OAT_DEBUG := false
76+
DONT_DEXPREOPT_PREBUILTS := true
77+
WITH_DEXPREOPT_PIC := true
78+
WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := true
79+
endif
80+
endif
4081
PRODUCT_SYSTEM_SERVER_COMPILER_FILTER := speed-profile
4182
PRODUCT_ALWAYS_PREOPT_EXTRACTED_APK := true
4283
PRODUCT_USE_PROFILE_FOR_BOOT_IMAGE := true
4384
PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION := frameworks/base/config/boot-image-profile.txt
4485

86+
# Display
87+
MAX_EGL_CACHE_KEY_SIZE := 12*1024
88+
MAX_EGL_CACHE_SIZE := 2048*1024
89+
NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
90+
91+
OVERRIDE_RS_DRIVER := libRSDriver_adreno.so
92+
93+
TARGET_CONTINUOUS_SPLASH_ENABLED := true
94+
TARGET_FORCE_HWC_FOR_VIRTUAL_DISPLAYS := true
95+
TARGET_USES_C2D_COMPOSITION := true
96+
TARGET_USES_ION := true
97+
TARGET_USES_NEW_ION_API := true
98+
USE_OPENGL_RENDERER := true
99+
100+
# Encryption
101+
TARGET_HW_DISK_ENCRYPTION := true
102+
TARGET_LEGACY_HW_DISK_ENCRYPTION := true
103+
TARGET_KEYMASTER_WAIT_FOR_QSEE := true
104+
45105
# Filesystem
46106
BOARD_FLASH_BLOCK_SIZE := 131072
47107
BOARD_BOOTIMAGE_PARTITION_SIZE := 33554432
108+
BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
48109
BOARD_CACHEIMAGE_PARTITION_SIZE := 67108864
49110
BOARD_PERSISTIMAGE_PARTITION_SIZE := 33554432
50111
BOARD_RECOVERYIMAGE_PARTITION_SIZE := 33554432
51112
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2147483648
52113
BOARD_USERDATAIMAGE_PARTITION_SIZE := 13042155008
53-
BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
54114
TARGET_FS_CONFIG_GEN := $(DEVICE_PATH)/fs_config/config.fs
115+
TARGET_USERIMAGES_USE_EXT4 := true
116+
TARGET_USERIMAGES_USE_F2FS := true
117+
118+
# FM
119+
AUDIO_FEATURE_ENABLED_FM_POWER_OPT := true
120+
BOARD_HAVE_QCOM_FM := true
121+
TARGET_QCOM_NO_FM_FIRMWARE := true
122+
123+
# Framework sched boost
124+
ENABLE_SCHED_BOOST := true
55125

56126
# GPS
57127
TARGET_NO_RPC := true
58128
USE_DEVICE_SPECIFIC_GPS := true
59129

130+
# Init
131+
TARGET_INIT_VENDOR_LIB := libinit_msm8916
132+
TARGET_RECOVERY_DEVICE_MODULES := libinit_msm8916
133+
60134
# Kernel
61135
BOARD_DTBTOOL_ARGS := -2
136+
BOARD_KERNEL_BASE := 0x80000000
137+
BOARD_KERNEL_CMDLINE := console=ttyHSL0,115200,n8 androidboot.console=ttyHSL0 androidboot.hardware=qcom msm_rtb.filter=0x237 ehci-hcd.park=3 androidboot.bootdevice=7824900.sdhci lpm_levels.sleep_disabled=1
62138
BOARD_KERNEL_IMAGE_NAME := Image
139+
BOARD_KERNEL_PAGESIZE := 2048
63140
BOARD_KERNEL_SEPARATED_DT := true
141+
BOARD_KERNEL_TAGS_OFFSET := 0x01E00000
142+
BOARD_RAMDISK_OFFSET := 0x02000000
64143
LZMA_RAMDISK_TARGETS := recovery
144+
65145
TARGET_KERNEL_CONFIG := lineageos_lettuce_defconfig
146+
TARGET_KERNEL_SOURCE := kernel/cyanogen/msm8916
66147

67148
# Lights
68149
TARGET_PROVIDES_LIBLIGHT := true
69150

70151
# LineageHW
71152
BOARD_HARDWARE_CLASS += $(DEVICE_PATH)/lineagehw
72153

154+
# HIDL
155+
DEVICE_MANIFEST_FILE := $(DEVICE_PATH)/manifest.xml
156+
157+
# Media
158+
TARGET_USES_MEDIA_EXTENSIONS := true
159+
73160
# Power
161+
TARGET_POWERHAL_VARIANT := qcom
74162
TARGET_TAP_TO_WAKE_NODE := "/sys/devices/soc.0/78b9000.i2c/i2c-5/5-0040/double_tap_enable"
75163

76164
# Properties
77165
TARGET_SYSTEM_PROP += $(DEVICE_PATH)/system.prop
78166

167+
# Radio
168+
MALLOC_SVELTE := true
169+
TARGET_RIL_VARIANT := caf
170+
79171
# Recovery
80172
TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/rootdir/etc/fstab.qcom
173+
TARGET_RECOVERY_UPDATER_LIBS := librecovery_updater_cm
174+
175+
# Releasetools
176+
TARGET_RELEASETOOLS_EXTENSIONS := $(DEVICE_PATH)
81177

82178
# SELinux
179+
include device/qcom/sepolicy/sepolicy.mk
180+
include device/qcom/sepolicy/legacy-sepolicy.mk
83181
BOARD_SEPOLICY_DIRS += $(DEVICE_PATH)/sepolicy
84182

85183
# Shims
86-
TARGET_LD_SHIM_LIBS += \
184+
TARGET_LD_SHIM_LIBS := \
87185
/system/vendor/lib64/lib-imsdpl.so|libshims_boringssl.so \
88186
/system/vendor/lib64/lib-imscamera.so|libshims_camera.so \
89187
/system/vendor/lib64/lib-imsvt.so|libshims_ims.so \
188+
/system/vendor/lib64/libflp.so|libshims_flp.so \
189+
/system/vendor/lib64/libizat_core.so|libshims_get_process_name.so \
190+
/system/vendor/lib/libflp.so|libshims_flp.so \
191+
/system/vendor/lib/libizat_core.so|libshims_get_process_name.so
90192

91193
# TWRP
92194
ifeq ($(WITH_TWRP),true)
@@ -99,5 +201,21 @@ TARGET_USE_SDCLANG := true
99201
# Widevine
100202
BOARD_WIDEVINE_OEMCRYPTO_LEVEL := 3
101203

204+
205+
# Wi-Fi
206+
BOARD_HAS_QCOM_WLAN := true
207+
BOARD_HOSTAPD_DRIVER := NL80211
208+
BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_qcwcn
209+
BOARD_WLAN_DEVICE := qcwcn
210+
BOARD_WPA_SUPPLICANT_DRIVER := NL80211
211+
BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_qcwcn
212+
213+
PRODUCT_VENDOR_MOVE_ENABLED := true
214+
TARGET_USES_QCOM_WCNSS_QMI := true
215+
216+
WIFI_DRIVER_FW_PATH_AP := "ap"
217+
WIFI_DRIVER_FW_PATH_STA := "sta"
218+
WPA_SUPPLICANT_VERSION := VER_0_8_X
219+
102220
# Inherit from proprietary files
103221
include vendor/yu/lettuce/BoardConfigVendor.mk

‎audio/audio_effects.xml

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<audio_effects_conf version="2.0" xmlns="http://schemas.android.com/audio/audio_effects_conf/v2_0">
3+
<libraries>
4+
<library name="bundle" path="libbundlewrapper.so"/>
5+
<library name="reverb" path="libreverbwrapper.so"/>
6+
<library name="qcbassboost" path="libqcbassboost.so"/>
7+
<library name="qcvirt" path="libqcvirt.so"/>
8+
<library name="qcreverb" path="libqcreverb.so"/>
9+
<library name="visualizer_sw" path="libvisualizer.so"/>
10+
<library name="visualizer_hw" path="libqcomvisualizer.so"/>
11+
<library name="downmix" path="libdownmix.so"/>
12+
<library name="loudness_enhancer" path="libldnhncr.so"/>
13+
<library name="proxy" path="libeffectproxy.so"/>
14+
<library name="offload_bundle" path="libqcompostprocbundle.so"/>
15+
<library name="audio_pre_processing" path="libqcomvoiceprocessing.so"/>
16+
</libraries>
17+
<effects>
18+
<effectProxy name="bassboost" library="proxy" uuid="14804144-a5ee-4d24-aa88-0002a5d5c51b">
19+
<libsw library="qcbassboost" uuid="23aca180-44bd-11e2-bcfd-0800200c9a66"/>
20+
<libhw library="offload_bundle" uuid="2c4a8c24-1581-487f-94f6-0002a5d5c51b"/>
21+
</effectProxy>
22+
<effectProxy name="virtualizer" library="proxy" uuid="d3467faa-acc7-4d34-acaf-0002a5d5c51b">
23+
<libsw library="qcvirt" uuid="e6c98a16-22a3-11e2-b87b-f23c91aec05e"/>
24+
<libhw library="offload_bundle" uuid="509a4498-561a-4bea-b3b1-0002a5d5c51b"/>
25+
</effectProxy>
26+
<effectProxy name="equalizer" library="proxy" uuid="c8e70ecd-48ca-456e-8a4f-0002a5d5c51b">
27+
<libsw library="bundle" uuid="ce772f20-847d-11df-bb17-0002a5d5c51b"/>
28+
<libhw library="offload_bundle" uuid="a0dac280-401c-11e3-9379-0002a5d5c51b"/>
29+
</effectProxy>
30+
<effect name="volume" library="bundle" uuid="119341a0-8469-11df-81f9-0002a5d5c51b"/>
31+
<effectProxy name="reverb_env_aux" library="proxy" uuid="48404ac9-d202-4ccc-bf84-0002a5d5c51b">
32+
<libsw library="qcreverb" uuid="a8c1e5f3-293d-43cd-95ec-d5e26c02e217"/>
33+
<libhw library="offload_bundle" uuid="79a18026-18fd-4185-8233-0002a5d5c51b"/>
34+
</effectProxy>
35+
<effectProxy name="reverb_env_ins" library="proxy" uuid="b707403a-a1c1-4291-9573-0002a5d5c51b">
36+
<libsw library="qcreverb" uuid="791fff8b-8129-4655-83a4-59bc61034c3a"/>
37+
<libhw library="offload_bundle" uuid="eb64ea04-973b-43d2-8f5e-0002a5d5c51b"/>
38+
</effectProxy>
39+
<effectProxy name="reverb_pre_aux" library="proxy" uuid="1b78f587-6d1c-422e-8b84-0002a5d5c51b">
40+
<libsw library="qcreverb" uuid="53ef1db5-c0c0-445b-b060-e34d20ebb70a"/>
41+
<libhw library="offload_bundle" uuid="6987be09-b142-4b41-9056-0002a5d5c51b"/>
42+
</effectProxy>
43+
<effectProxy name="reverb_pre_ins" library="proxy" uuid="f3e178d2-ebcb-408e-8357-0002a5d5c51b">
44+
<libsw library="qcreverb" uuid="b08a0e38-22a5-11e2-b87b-f23c91aec05e"/>
45+
<libhw library="offload_bundle" uuid="aa2bebf6-47cf-4613-9bca-0002a5d5c51b"/>
46+
</effectProxy>
47+
<effectProxy name="visualizer" library="proxy" uuid="1d0a1a53-7d5d-48f2-8e71-27fbd10d842c">
48+
<libsw library="visualizer_sw" uuid="d069d9e0-8329-11df-9168-0002a5d5c51b"/>
49+
<libhw library="visualizer_hw" uuid="7a8044a0-1a71-11e3-a184-0002a5d5c51b"/>
50+
</effectProxy>
51+
<effect name="downmix" library="downmix" uuid="93f04452-e4fe-41cc-91f9-e475b6d1d69f"/>
52+
<effect name="loudness_enhancer" library="loudness_enhancer" uuid="fa415329-2034-4bea-b5dc-5b381c8d1e2c"/>
53+
<effect name="aec" library="audio_pre_processing" uuid="0f8d0d2a-59e5-45fe-b6e4-248c8a799109"/>
54+
<effect name="ns" library="audio_pre_processing" uuid="1d97bb0b-9e2f-4403-9ae3-58c2554306f8"/>
55+
</effects>
56+
</audio_effects_conf>

0 commit comments

Comments
 (0)