diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 7f890521..6bafc5e2 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -22,20 +22,14 @@ # definition file). # +# Common Tree Path COMMON_PATH := device/xiaomi/sdm660-common -BOARD_VENDOR := xiaomi +# ANT+ +BOARD_ANT_WIRELESS_DEVICE := "qualcomm-hidl" -# Use Snapdragon LLVM, if available -TARGET_USE_SDCLANG := true - -# Bootloader -TARGET_BOOTLOADER_BOARD_NAME := sdm660 -TARGET_NO_BOOTLOADER := true - -# Platform -TARGET_BOARD_PLATFORM := sdm660 -TARGET_BOARD_PLATFORM_GPU := qcom-adreno512 +# APEX image +DEXPREOPT_GENERATE_APEX_IMAGE := true # Architecture TARGET_ARCH := arm64 @@ -44,40 +38,13 @@ TARGET_CPU_ABI := arm64-v8a TARGET_CPU_ABI2 := TARGET_CPU_VARIANT := kryo +# Architecture 2 TARGET_2ND_ARCH := arm TARGET_2ND_ARCH_VARIANT := armv8-a TARGET_2ND_CPU_ABI := armeabi-v7a TARGET_2ND_CPU_ABI2 := armeabi TARGET_2ND_CPU_VARIANT := kryo -TARGET_USES_64_BIT_BINDER := true -BUILD_BROKEN_DUP_RULES := true -BUILD_BROKEN_PHONY_TARGETS := true - -# Kernel -BOARD_KERNEL_CMDLINE := console=ttyMSM0,115200,n8 androidboot.console=ttyMSM0 earlycon=msm_serial_dm,0xc170000 androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x37 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 sched_enable_hmp=1 sched_enable_power_aware=1 service_locator.enable=1 swiotlb=1 androidboot.configfs=true androidboot.usbcontroller=a800000.dwc3 -BOARD_KERNEL_CMDLINE += loop.max_part=7 -BOARD_KERNEL_BASE := 0x00000000 -BOARD_KERNEL_PAGESIZE := 4096 -BOARD_KERNEL_TAGS_OFFSET := 0x00000100 -BOARD_RAMDISK_OFFSET := 0x01000000 -BOARD_KERNEL_IMAGE_NAME := Image.gz-dtb -TARGET_KERNEL_ARCH := arm64 -TARGET_KERNEL_HEADER_ARCH := arm64 -TARGET_KERNEL_VERSION := 4.4 -TARGET_KERNEL_CLANG_COMPILE := true -TARGET_KERNEL_CLANG_VERSION := r353983c - -# QCOM hardware -BOARD_USES_QCOM_HARDWARE := true -TARGET_USES_QCOM_BSP := false - -# ANT+ -BOARD_ANT_WIRELESS_DEVICE := "qualcomm-hidl" - -# APEX image -DEXPREOPT_GENERATE_APEX_IMAGE := true - # Audio BOARD_USES_ALSA_AUDIO := true USE_CUSTOM_AUDIO_POLICY := 1 @@ -86,6 +53,9 @@ BOARD_SUPPORTS_SOUND_TRIGGER_HAL := true AUDIO_USE_DEEP_AS_PRIMARY_OUTPUT := false AUDIO_DISABLE_SWAP_CHANNELS := true +# Binder +TARGET_USES_64_BIT_BINDER := true + # Bluetooth BOARD_HAVE_BLUETOOTH := true BOARD_HAVE_BLUETOOTH_QCOM := true @@ -96,6 +66,19 @@ QCOM_BT_USE_BTNV := true QCOM_BT_USE_SMD_TTY := true TARGET_USE_QTI_BT_STACK := true +# Bootloader +TARGET_BOOTLOADER_BOARD_NAME := sdm660 +TARGET_NO_BOOTLOADER := true + +# Board +TARGET_BOARD_PLATFORM := sdm660 +TARGET_BOARD_PLATFORM_GPU := qcom-adreno512 +BOARD_VENDOR := xiaomi + +# Build Rules +BUILD_BROKEN_DUP_RULES := true +BUILD_BROKEN_PHONY_TARGETS := true + # Camera USE_DEVICE_SPECIFIC_CAMERA := true TARGET_USES_QTI_CAMERA_DEVICE := true @@ -108,9 +91,16 @@ BOARD_CHARGER_ENABLE_SUSPEND := true BOARD_CHARGER_DISABLE_INIT_BLANK := true HEALTHD_USE_BATTERY_INFO := true +# Clang +TARGET_KERNEL_CLANG_COMPILE := true +TARGET_KERNEL_CLANG_VERSION := r353983c + # CNE and DPM BOARD_USES_QCNE := true +# ConfigFS +TARGET_FS_CONFIG_GEN := $(COMMON_PATH)/configs/config.fs + # Crypto TARGET_HW_DISK_ENCRYPTION := true @@ -123,7 +113,7 @@ TARGET_USES_ION := true # DRM TARGET_ENABLE_MEDIADRM_64 := true -# Enable dexpreopt to speed boot time +# Dexpreopt ifeq ($(HOST_OS),linux) ifneq ($(TARGET_BUILD_VARIANT),eng) ifeq ($(WITH_DEXPREOPT),) @@ -169,7 +159,19 @@ TARGET_RECOVERY_DEVICE_MODULES := libinit_sdm660 USE_DEVICE_SPECIFIC_DATA_IPA_CFG_MGR := true USE_DEVICE_SPECIFIC_IPACFG_MGR := true -# Keystore +# Kernel +BOARD_KERNEL_CMDLINE := console=ttyMSM0,115200,n8 androidboot.console=ttyMSM0 earlycon=msm_serial_dm,0xc170000 androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x37 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 sched_enable_hmp=1 sched_enable_power_aware=1 service_locator.enable=1 swiotlb=1 androidboot.configfs=true androidboot.usbcontroller=a800000.dwc3 +BOARD_KERNEL_CMDLINE += loop.max_part=7 +BOARD_KERNEL_BASE := 0x00000000 +BOARD_KERNEL_PAGESIZE := 4096 +BOARD_KERNEL_TAGS_OFFSET := 0x00000100 +BOARD_RAMDISK_OFFSET := 0x01000000 +BOARD_KERNEL_IMAGE_NAME := Image.gz-dtb +TARGET_KERNEL_ARCH := arm64 +TARGET_KERNEL_HEADER_ARCH := arm64 +TARGET_KERNEL_VERSION := 4.4 + +# Keymaster TARGET_PROVIDES_KEYMASTER := true # Partitions @@ -184,23 +186,19 @@ BOARD_SYSTEMIMAGE_PARTITION_TYPE := ext4 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3221225472 BOARD_VENDORIMAGE_PARTITION_SIZE := 2147483648 BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 +TARGET_USERIMAGES_USE_EXT4 := true +TARGET_USERIMAGES_USE_F2FS := true -TARGET_EXFAT_DRIVER := exfat - +# Extra Symlink BOARD_ROOT_EXTRA_SYMLINKS := \ /vendor/dsp:/dsp \ /vendor/firmware_mnt:/firmware \ /vendor/bt_firmware:/bt_firmware \ /mnt/vendor/persist:/persist +# Directory TARGET_COPY_OUT_PRODUCT := system/product TARGET_COPY_OUT_VENDOR := vendor -TARGET_USERIMAGES_USE_EXT4 := true -TARGET_USERIMAGES_USE_F2FS := true - -TARGET_USES_MKE2FS := true - -TARGET_FS_CONFIG_GEN := $(COMMON_PATH)/config.fs # Peripheral manager TARGET_PER_MGR_ENABLED := true @@ -211,6 +209,10 @@ TARGET_USES_INTERACTION_BOOST := true # Properties BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true +# QCOM hardware +BOARD_USES_QCOM_HARDWARE := true +TARGET_USES_QCOM_BSP := false + # Recovery ifneq ($(filter lavender,$(TARGET_DEVICE)),) TARGET_RECOVERY_FSTAB := $(COMMON_PATH)/rootdir/etc/fstab_A.qcom @@ -225,11 +227,12 @@ BOARD_HAS_LARGE_FILESYSTEM := true OVERRIDE_RS_DRIVER := libRSDriver_adreno.so # RIL -TARGET_PROVIDES_QTI_TELEPHONY_JAR := true PROTOBUF_SUPPORTED := true +TARGET_PROVIDES_QTI_TELEPHONY_JAR := true +TARGET_USES_ALTERNATIVE_MANUAL_NETWORK_SELECT := true -# Timeservice -BOARD_USES_QC_TIME_SERVICES := true +# SDCLANG +TARGET_USE_SDCLANG := true # SELinux include device/qcom/sepolicy-legacy-um/sepolicy.mk @@ -237,15 +240,9 @@ BOARD_SEPOLICY_DIRS += $(COMMON_PATH)/sepolicy/vendor BOARD_PLAT_PUBLIC_SEPOLICY_DIR += $(COMMON_PATH)/sepolicy/public BOARD_PLAT_PRIVATE_SEPOLICY_DIR += $(COMMON_PATH)/sepolicy/private -# Telephony -TARGET_USES_ALTERNATIVE_MANUAL_NETWORK_SELECT := true - # Treble -BOARD_VNDK_VERSION := current -BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true PRODUCT_FULL_TREBLE_OVERRIDE := true PRODUCT_VENDOR_MOVE_ENABLED := true -PRODUCT_EXTRA_VNDK_VERSIONS := 28 # Timeservice BOARD_USES_QC_TIME_SERVICES := true @@ -253,6 +250,10 @@ BOARD_USES_QC_TIME_SERVICES := true # Use mke2fs to create ext4 images TARGET_USES_MKE2FS := true +# VNDK +BOARD_VNDK_VERSION := current +PRODUCT_EXTRA_VNDK_VERSIONS := 28 + # Wifi BOARD_USES_AOSP_WLAN_HAL := true BOARD_HAS_QCOM_WLAN := true diff --git a/doze/Android.mk b/XiaomiDoze/Android.mk similarity index 100% rename from doze/Android.mk rename to XiaomiDoze/Android.mk diff --git a/doze/AndroidManifest.xml b/XiaomiDoze/AndroidManifest.xml similarity index 100% rename from doze/AndroidManifest.xml rename to XiaomiDoze/AndroidManifest.xml diff --git a/doze/proguard.flags b/XiaomiDoze/proguard.flags similarity index 100% rename from doze/proguard.flags rename to XiaomiDoze/proguard.flags diff --git a/doze/res/color-night/switchbar_switch_thumb_tint.xml b/XiaomiDoze/res/color-night/switchbar_switch_thumb_tint.xml similarity index 100% rename from doze/res/color-night/switchbar_switch_thumb_tint.xml rename to XiaomiDoze/res/color-night/switchbar_switch_thumb_tint.xml diff --git a/doze/res/color-night/switchbar_switch_track_tint.xml b/XiaomiDoze/res/color-night/switchbar_switch_track_tint.xml similarity index 100% rename from doze/res/color-night/switchbar_switch_track_tint.xml rename to XiaomiDoze/res/color-night/switchbar_switch_track_tint.xml diff --git a/doze/res/color/switch_bar_bg.xml b/XiaomiDoze/res/color/switch_bar_bg.xml similarity index 100% rename from doze/res/color/switch_bar_bg.xml rename to XiaomiDoze/res/color/switch_bar_bg.xml diff --git a/doze/res/color/switchbar_switch_thumb_tint.xml b/XiaomiDoze/res/color/switchbar_switch_thumb_tint.xml similarity index 100% rename from doze/res/color/switchbar_switch_thumb_tint.xml rename to XiaomiDoze/res/color/switchbar_switch_thumb_tint.xml diff --git a/doze/res/color/switchbar_switch_track_tint.xml b/XiaomiDoze/res/color/switchbar_switch_track_tint.xml similarity index 100% rename from doze/res/color/switchbar_switch_track_tint.xml rename to XiaomiDoze/res/color/switchbar_switch_track_tint.xml diff --git a/doze/res/drawable/switchbar_background.xml b/XiaomiDoze/res/drawable/switchbar_background.xml similarity index 100% rename from doze/res/drawable/switchbar_background.xml rename to XiaomiDoze/res/drawable/switchbar_background.xml diff --git a/doze/res/layout/doze.xml b/XiaomiDoze/res/layout/doze.xml similarity index 100% rename from doze/res/layout/doze.xml rename to XiaomiDoze/res/layout/doze.xml diff --git a/doze/res/layout/preference_category_material_settings.xml b/XiaomiDoze/res/layout/preference_category_material_settings.xml similarity index 100% rename from doze/res/layout/preference_category_material_settings.xml rename to XiaomiDoze/res/layout/preference_category_material_settings.xml diff --git a/doze/res/layout/preference_material_settings.xml b/XiaomiDoze/res/layout/preference_material_settings.xml similarity index 100% rename from doze/res/layout/preference_material_settings.xml rename to XiaomiDoze/res/layout/preference_material_settings.xml diff --git a/doze/res/layout/switch_bar.xml b/XiaomiDoze/res/layout/switch_bar.xml similarity index 100% rename from doze/res/layout/switch_bar.xml rename to XiaomiDoze/res/layout/switch_bar.xml diff --git a/doze/res/values-ru/strings.xml b/XiaomiDoze/res/values-ru/strings.xml similarity index 100% rename from doze/res/values-ru/strings.xml rename to XiaomiDoze/res/values-ru/strings.xml diff --git a/doze/res/values/strings.xml b/XiaomiDoze/res/values/strings.xml similarity index 100% rename from doze/res/values/strings.xml rename to XiaomiDoze/res/values/strings.xml diff --git a/doze/res/values/styles.xml b/XiaomiDoze/res/values/styles.xml similarity index 100% rename from doze/res/values/styles.xml rename to XiaomiDoze/res/values/styles.xml diff --git a/doze/res/xml/doze_settings.xml b/XiaomiDoze/res/xml/doze_settings.xml similarity index 100% rename from doze/res/xml/doze_settings.xml rename to XiaomiDoze/res/xml/doze_settings.xml diff --git a/doze/src/org/lineageos/settings/doze/BootCompletedReceiver.java b/XiaomiDoze/src/org/lineageos/settings/doze/BootCompletedReceiver.java similarity index 100% rename from doze/src/org/lineageos/settings/doze/BootCompletedReceiver.java rename to XiaomiDoze/src/org/lineageos/settings/doze/BootCompletedReceiver.java diff --git a/doze/src/org/lineageos/settings/doze/DozeService.java b/XiaomiDoze/src/org/lineageos/settings/doze/DozeService.java similarity index 100% rename from doze/src/org/lineageos/settings/doze/DozeService.java rename to XiaomiDoze/src/org/lineageos/settings/doze/DozeService.java diff --git a/doze/src/org/lineageos/settings/doze/DozeSettingsActivity.java b/XiaomiDoze/src/org/lineageos/settings/doze/DozeSettingsActivity.java similarity index 100% rename from doze/src/org/lineageos/settings/doze/DozeSettingsActivity.java rename to XiaomiDoze/src/org/lineageos/settings/doze/DozeSettingsActivity.java diff --git a/doze/src/org/lineageos/settings/doze/DozeSettingsFragment.java b/XiaomiDoze/src/org/lineageos/settings/doze/DozeSettingsFragment.java similarity index 100% rename from doze/src/org/lineageos/settings/doze/DozeSettingsFragment.java rename to XiaomiDoze/src/org/lineageos/settings/doze/DozeSettingsFragment.java diff --git a/doze/src/org/lineageos/settings/doze/ProximitySensor.java b/XiaomiDoze/src/org/lineageos/settings/doze/ProximitySensor.java similarity index 100% rename from doze/src/org/lineageos/settings/doze/ProximitySensor.java rename to XiaomiDoze/src/org/lineageos/settings/doze/ProximitySensor.java diff --git a/doze/src/org/lineageos/settings/doze/TiltSensor.java b/XiaomiDoze/src/org/lineageos/settings/doze/TiltSensor.java similarity index 100% rename from doze/src/org/lineageos/settings/doze/TiltSensor.java rename to XiaomiDoze/src/org/lineageos/settings/doze/TiltSensor.java diff --git a/doze/src/org/lineageos/settings/doze/Utils.java b/XiaomiDoze/src/org/lineageos/settings/doze/Utils.java similarity index 100% rename from doze/src/org/lineageos/settings/doze/Utils.java rename to XiaomiDoze/src/org/lineageos/settings/doze/Utils.java diff --git a/properties.mk b/common_prop.mk similarity index 93% rename from properties.mk rename to common_prop.mk index 5ec617ca..da81a728 100644 --- a/properties.mk +++ b/common_prop.mk @@ -3,12 +3,12 @@ BUILD_FINGERPRINT := "xiaomi/wayne/wayne:8.1.0/OPM1.171019.011/V9.5.11.0.ODCCNFA # ART PRODUCT_PROPERTY_OVERRIDES += \ - dalvik.vm.dex2oat-filter=speed \ - dalvik.vm.image-dex2oat-filter=speed \ - ro.vendor.qti.am.reschedule_service=true \ - ro.sys.fw.dex2oat_thread_count=8 \ dalvik.vm.boot-dex2oat-threads=8 \ - dalvik.vm.dex2oat-threads=8 + dalvik.vm.dex2oat-filter=speed \ + dalvik.vm.dex2oat-threads=8 \ + dalvik.vm.image-dex2oat-filter=speed \ + ro.sys.fw.dex2oat_thread_count=8 \ + ro.vendor.qti.am.reschedule_service=true # Audio PRODUCT_PROPERTY_OVERRIDES += \ @@ -16,8 +16,9 @@ PRODUCT_PROPERTY_OVERRIDES += \ audio.deep_buffer.media=true \ audio.offload.min.duration.secs=30 \ audio.offload.video=true \ - audio.safemedia.bypass=true \ - vendor.audio.volume.headset.gain.depcal=true \ + audio.safemedia.bypass=true \ + audio.sys.noisy.broadcast.delay=600 \ + audio.sys.offload.pstimeout.secs=3 \ persist.dirac.acs.controller=qem \ persist.dirac.acs.ignore_error=1 \ persist.dirac.acs.storeSettings=1 \ @@ -37,31 +38,31 @@ PRODUCT_PROPERTY_OVERRIDES += \ vendor.audio.dolby.ds2.enabled=false \ vendor.audio.dolby.ds2.hardbypass=false \ vendor.audio.flac.sw.decoder.24bit=true \ + vendor.audio_hal.period_size=192 \ vendor.audio.hw.aac.encoder=true \ - audio.sys.noisy.broadcast.delay=600 \ vendor.audio.offload.buffer.size.kb=64 \ vendor.audio.offload.gapless.enabled=true \ vendor.audio.offload.multiaac.enable=true \ vendor.audio.offload.multiple.enabled=false \ vendor.audio.offload.passthrough=false \ - audio.sys.offload.pstimeout.secs=3 \ vendor.audio.offload.track.enable=false \ vendor.audio.parser.ip.buffer.size=262144 \ vendor.audio.safx.pbe.enabled=false \ + vendor.audio.snd_card.open.retries=50 \ vendor.audio.tunnel.encode=false \ vendor.audio.use.sw.alac.decoder=true \ vendor.audio.use.sw.ape.decoder=true \ - vendor.audio.snd_card.open.retries=50 \ - vendor.audio_hal.period_size=192 \ - vendor.audio.spkr_prot.tx.sampling_rate=48000\ + vendor.audio.spkr_prot.tx.sampling_rate=48000 \ + vendor.audio.volume.headset.gain.depcal=true \ vendor.fm.a2dp.conc.disabled=true \ vendor.voice.path.for.pcm.voip=true # Audio Feature - PRODUCT_PROPERTY_OVERRIDES += \ +PRODUCT_PROPERTY_OVERRIDES += \ vendor.audio.feature.a2dp_offload.enable=false \ vendor.audio.feature.afe_proxy.enable=true \ vendor.audio.feature.anc_headset.enable=true \ + vendor.audio.feature.audiozoom.enable=false \ vendor.audio.feature.battery_listener.enable=false \ vendor.audio.feature.compr_cap.enable=false \ vendor.audio.feature.compress_in.enable=false \ @@ -69,6 +70,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ vendor.audio.feature.compr_voip.enable=true \ vendor.audio.feature.concurrent_capture.enable=false \ vendor.audio.feature.custom_stereo.enable=true \ + vendor.audio.feature.deepbuffer_as_primary.enable=false \ vendor.audio.feature.display_port.enable=false \ vendor.audio.feature.dsm_feedback.enable=false \ vendor.audio.feature.dynamic_ecns.enable=false \ @@ -90,37 +92,35 @@ PRODUCT_PROPERTY_OVERRIDES += \ vendor.audio.feature.maxx_audio.enable=false \ vendor.audio.feature.ras.enable=false \ vendor.audio.feature.record_play_concurency.enable=false \ + vendor.audio.feature.snd_mon.enable=false \ vendor.audio.feature.src_trkn.enable=true \ vendor.audio.feature.spkr_prot.enable=false \ vendor.audio.feature.ssrec.enable=false \ vendor.audio.feature.usb_offload.enable=false \ vendor.audio.feature.usb_offload_burst_mode.enable=false \ vendor.audio.feature.usb_offload_sidetone_volume.enable=false \ - vendor.audio.feature.deepbuffer_as_primary.enable=false \ vendor.audio.feature.vbat.enable=true \ - vendor.audio.feature.wsa.enable=true \ - vendor.audio.feature.audiozoom.enable=false \ - vendor.audio.feature.snd_mon.enable=false + vendor.audio.feature.wsa.enable=true # Bluetooth PRODUCT_PROPERTY_OVERRIDES += \ - vendor.qcom.bluetooth.soc=cherokee \ - persist.bluetooth.bluetooth_audio_hal.disabled=false \ - ro.vendor.bluetooth.wipower=false \ persist.bluetooth.a2dp_offload.disabled=false \ - persist.vendor.qcom.bluetooth.enable.splita2dp=false \ + persist.bluetooth.bluetooth_audio_hal.disabled=false \ persist.vendor.bt.a2dp_offload_cap=sbc-aac-aptx-aptxhd-ldac \ - persist.vendor.bt.aac_frm_ctl.enabled=true + persist.vendor.bt.aac_frm_ctl.enabled=true \ + persist.vendor.qcom.bluetooth.enable.splita2dp=false \ + ro.vendor.bluetooth.wipower=false \ + vendor.qcom.bluetooth.soc=cherokee # Camera PRODUCT_PROPERTY_OVERRIDES += \ camera.aux.packagelist=org.codeaurora.snapcam,com.android.camera,com.qualcomm.qti.qmmi \ + persist.camera.privapp.list=org.codeaurora.snapcam \ persist.vendor.camera.HAL3.enabled=1 \ persist.vendor.camera.eis.enable=1 \ persist.vendor.camera.exif.make=Xiaomi \ - vendor.camera.aux.packagelist=org.codeaurora.snapcam,com.android.camera,com.qualcomm.qti.qmmi \ persist.vendor.camera.privapp.list=org.codeaurora.snapcam \ - persist.camera.privapp.list=org.codeaurora.snapcam + vendor.camera.aux.packagelist=org.codeaurora.snapcam,com.android.camera,com.qualcomm.qti.qmmi \ # Codec2 switch PRODUCT_PROPERTY_OVERRIDES += \ @@ -155,8 +155,8 @@ PRODUCT_PROPERTY_OVERRIDES += \ vendor.display.disable_skip_validate=1 \ vendor.gralloc.enable_fb_ubwc=1 \ vendor.video.disable.ubwc=1 \ - video.disable.ubwc=1 \ - vendor.display.enable_default_color_mode=0 + vendor.display.enable_default_color_mode=0 \ + video.disable.ubwc=1 # The default sf phase offset is set to 6ms, to avoid it be included into next # vsync threshold, set high fps early sf and next vsync threshold phase offset @@ -166,7 +166,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ debug.sf.high_fps_early_gl_phase_offset_ns=9000000 \ debug.sf.phase_offset_threshold_for_next_vsync_ns=6100000 -# enable FIFO scheduling for UI and Render threads by default +# FIFO scheduling for UI PRODUCT_PROPERTY_OVERRIDES += \ sys.use_fifo_ui=1 @@ -260,27 +260,27 @@ PRODUCT_PROPERTY_OVERRIDES += \ persist.vendor.radio.apm_sim_not_pwdn=1 \ persist.vendor.radio.atfwd.start=true \ persist.vendor.radio.custom_ecc=1 \ + persist.vendor.radio.data_con_rprt=1 \ + persist.vendor.radio.data_ltd_sys_ind=1 \ + persist.vendor.radio.flexmap_type=none \ persist.vendor.radio.rat_on=combine \ persist.vendor.radio.sib16_support=1 \ persist.vendor.radio.procedure_bytes=SKIP \ - persist.vendor.radio.flexmap_type=none \ ril.subscription.types=NV,RUIM \ rild.libpath=/system/vendor/lib64/libril-qc-qmi-1.so \ ro.telephony.default_network=22,20 \ + ro.telephony.iwlan_operation_mode=legacy \ ro.vendor.use_data_netmgrd=true \ - telephony.lteOnCdmaDevice=1 \ - persist.vendor.radio.data_ltd_sys_ind=1 \ - persist.vendor.radio.data_con_rprt=1 \ - ro.telephony.iwlan_operation_mode=legacy + telephony.lteOnCdmaDevice=1 # Rendering PRODUCT_PROPERTY_OVERRIDES += \ - debug.enable.sglscale=1 \ debug.egl.hw=1 \ + debug.enable.sglscale=1 \ debug.sf.disable_hwc=0 \ + debug.sf.gpu_comp_tiling=1 \ debug.sf.recomputecrop=0 \ - persist.hwc.ptor.enable=true \ - debug.sf.gpu_comp_tiling=1 + persist.hwc.ptor.enable=true # Sensor PRODUCT_PROPERTY_OVERRIDES += \ @@ -294,9 +294,9 @@ PRODUCT_PROPERTY_OVERRIDES += \ # SurfaceFlinger PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ - ro.surface_flinger.protected_contents=true \ ro.surface_flinger.force_hwc_copy_for_virtual_displays=true \ ro.surface_flinger.max_virtual_display_dimension=4096 \ + ro.surface_flinger.protected_contents=true \ ro.surface_flinger.vsync_event_phase_offset_ns=2000000 \ ro.surface_flinger.vsync_sf_event_phase_offset_ns=6000000 diff --git a/audio/audio_effects.xml b/configs/audio/audio_effects.xml similarity index 100% rename from audio/audio_effects.xml rename to configs/audio/audio_effects.xml diff --git a/audio/audio_output_policy.conf b/configs/audio/audio_output_policy.conf similarity index 100% rename from audio/audio_output_policy.conf rename to configs/audio/audio_output_policy.conf diff --git a/audio/audio_policy_configuration.xml b/configs/audio/audio_policy_configuration.xml similarity index 100% rename from audio/audio_policy_configuration.xml rename to configs/audio/audio_policy_configuration.xml diff --git a/audio/audio_tuning_mixer.txt b/configs/audio/audio_tuning_mixer.txt similarity index 100% rename from audio/audio_tuning_mixer.txt rename to configs/audio/audio_tuning_mixer.txt diff --git a/audio/graphite_ipc_platform_info.xml b/configs/audio/graphite_ipc_platform_info.xml similarity index 100% rename from audio/graphite_ipc_platform_info.xml rename to configs/audio/graphite_ipc_platform_info.xml diff --git a/audio/listen_platform_info.xml b/configs/audio/listen_platform_info.xml similarity index 100% rename from audio/listen_platform_info.xml rename to configs/audio/listen_platform_info.xml diff --git a/audio/sound_trigger_mixer_paths.xml b/configs/audio/sound_trigger_mixer_paths.xml similarity index 100% rename from audio/sound_trigger_mixer_paths.xml rename to configs/audio/sound_trigger_mixer_paths.xml diff --git a/audio/sound_trigger_platform_info.xml b/configs/audio/sound_trigger_platform_info.xml similarity index 100% rename from audio/sound_trigger_platform_info.xml rename to configs/audio/sound_trigger_platform_info.xml diff --git a/config.fs b/configs/config.fs similarity index 100% rename from config.fs rename to configs/config.fs diff --git a/idc/uinput-fpc.idc b/configs/idc/uinput-fpc.idc similarity index 100% rename from idc/uinput-fpc.idc rename to configs/idc/uinput-fpc.idc diff --git a/idc/uinput-goodix.idc b/configs/idc/uinput-goodix.idc similarity index 100% rename from idc/uinput-goodix.idc rename to configs/idc/uinput-goodix.idc diff --git a/configs/media_codecs.xml b/configs/media/media_codecs.xml similarity index 100% rename from configs/media_codecs.xml rename to configs/media/media_codecs.xml diff --git a/configs/media_codecs_performance.xml b/configs/media/media_codecs_performance.xml similarity index 100% rename from configs/media_codecs_performance.xml rename to configs/media/media_codecs_performance.xml diff --git a/configs/whitelistedapps.xml b/configs/perf/whitelistedapps.xml similarity index 100% rename from configs/whitelistedapps.xml rename to configs/perf/whitelistedapps.xml diff --git a/configs/privapp-permissions-hotword.xml b/configs/privapp-permission/privapp-permissions-hotword.xml similarity index 100% rename from configs/privapp-permissions-hotword.xml rename to configs/privapp-permission/privapp-permissions-hotword.xml diff --git a/configs/privapp-permissions-qti-product.xml b/configs/privapp-permission/privapp-permissions-qti-product.xml similarity index 100% rename from configs/privapp-permissions-qti-product.xml rename to configs/privapp-permission/privapp-permissions-qti-product.xml diff --git a/configs/privapp-permissions-qti-system.xml b/configs/privapp-permission/privapp-permissions-qti-system.xml similarity index 100% rename from configs/privapp-permissions-qti-system.xml rename to configs/privapp-permission/privapp-permissions-qti-system.xml diff --git a/sensors/hals.conf b/configs/sensors/hals.conf similarity index 100% rename from sensors/hals.conf rename to configs/sensors/hals.conf diff --git a/wifi/WCNSS_qcom_cfg.ini b/configs/wifi/WCNSS_qcom_cfg.ini similarity index 100% rename from wifi/WCNSS_qcom_cfg.ini rename to configs/wifi/WCNSS_qcom_cfg.ini diff --git a/wifi/p2p_supplicant_overlay.conf b/configs/wifi/p2p_supplicant_overlay.conf similarity index 100% rename from wifi/p2p_supplicant_overlay.conf rename to configs/wifi/p2p_supplicant_overlay.conf diff --git a/wifi/wpa_supplicant_overlay.conf b/configs/wifi/wpa_supplicant_overlay.conf similarity index 100% rename from wifi/wpa_supplicant_overlay.conf rename to configs/wifi/wpa_supplicant_overlay.conf diff --git a/overlay-lineage/frameworks/base/core/res/res/values/config.xml b/overlay-lineage/frameworks/base/core/res/res/values/config.xml deleted file mode 100644 index 567c562f..00000000 --- a/overlay-lineage/frameworks/base/core/res/res/values/config.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - 0 - - - - A_Standard:standard - B_Warm mode:reading - D_Cold mode:dynamic - - - - true - diff --git a/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml b/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml index 075a3c73..b00f0f00 100644 --- a/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml +++ b/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml @@ -14,11 +14,6 @@ limitations under the License. --> - - true - true - 232 - - true - - - true diff --git a/overlay-lineage/packages/apps/Dialer/java/com/android/dialer/callrecord/res/values/config.xml b/overlay-lineage/packages/apps/Dialer/java/com/android/dialer/callrecord/res/values/config.xml deleted file mode 100644 index da46c314..00000000 --- a/overlay-lineage/packages/apps/Dialer/java/com/android/dialer/callrecord/res/values/config.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - true - 4 - diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index 6d074c68..e549dd3b 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -17,6 +17,32 @@ + + + true + + + true + + + 15 + + + true + + + true + + + 3700 + + + true + + + true + true @@ -607,19 +633,6 @@ 399.81 - - 10 - - - 98 - - - 1 - 200 - - true + + 10 - - - true + + 98 - - true + + 1 - - true + + 0 - - Android-Mms/2.0 + + 0 - - 15 + + false - - http://www.google.com/oha/rdf/ua-profile-kila.xml + + true - - true - - - false - - - true - - - - "usb\\d" - "rndis\\d" + + + A_Standard:standard + B_Warm mode:reading + D_Cold mode:dynamic - - - "wlan0" - "softap0" - + + true - - - - 192.168.42.2 - 192.168.42.254 - 192.168.43.2 - 192.168.43.254 - 192.168.44.2 - 192.168.44.254 - 192.168.45.2 - 192.168.45.254 - 192.168.46.2 - 192.168.46.254 - 192.168.47.2 - 192.168.47.254 - 192.168.48.2 - 192.168.48.254 - 192.168.49.2 - 192.168.49.254 - 192.168.50.2 - 192.168.50.254 - 192.168.51.2 - 192.168.51.254 - + + true - - true - - - - "softap1" - "softap2" - - - - - "bt-pan" - - - - true - - - - - - - "wifi,1,1,1,-1,true" - "mobile,0,0,0,-1,true" - "mobile_mms,2,0,4,60000,true" - "mobile_supl,3,0,2,60000,true" - "mobile_dun,4,0,2,60000,true" - "mobile_hipri,5,0,3,60000,true" - "mobile_fota,10,0,2,60000,true" - "mobile_ims,11,0,2,60000,true" - "mobile_cbs,12,0,2,60000,true" - "bluetooth,7,7,2,-1,true" - "mobile_emergency,15,0,5,-1,true" - "ethernet,9,9,9,-1,true" - - - - - - "1,1" - "0,1" - "7,1" - "9,1" - - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - false + + true com.android.systemui/com.android.systemui.doze.DozeService + + true + + + true + + + false + true @@ -889,112 +777,32 @@ that can be set by the user. --> 17 + + true + + + true + + + true + + + true + + + true + true - - - "5gnr:2097152,6291456,16777216,512000,2097152,8388608" - "lte:2097152,4194304,8388608,262144,524288,1048576" - "lte_ca:4096,6291456,12582912,4096,1048576,2097152" - "umts:4094,87380,1220608,4096,16384,1220608" - "hspa:4094,87380,1220608,4096,16384,1220608" - "hsupa:4094,87380,1220608,4096,16384,1220608" - "hsdpa:4094,87380,1220608,4096,16384,1220608" - "hspap:4094,87380,1220608,4096,16384,1220608" - "edge:4093,26280,35040,4096,16384,35040" - "gprs:4092,8760,11680,4096,8760,11680" - "evdo:4094,87380,524288,4096,16384,262144" - - - - 524288,2097152,8388608,262144,524288,4194304 - - - true - - - true - true - - - true - - - true - - - 4 - - - true - - - org.codeaurora.ims - - - true - - - true - - - false - - - false - - - true - - - true - - - true - - - true - - - -100 - -100 - -100 - -100 - - - true - - - - 0 - 7 - 10 - - - - - 0 - 5 - 10 - - - - - 10 - + + true 3 - - 3700 + + true com.google.android.gms - - true + + true + + + "M50 0C77.6 0 100 22.4 100 50C100 77.6 77.6 100 50 100C22.4 100 0 77.6 0 50C0 22.4 22.4 0 50 0Z" + + + true + + + true + true + + + true + + + true + + + org.codeaurora.ims + + + true + + + true + + + true + + + false + + + 0xFFFFFFFF + + + 0xFFFFFFFF + + + 0xFFFFFFFF + + + false + + + Android-Mms/2.0 + + + http://www.google.com/oha/rdf/ua-profile-kila.xml + + + true + + + 4 + + + true + + + true + + + true + + + true @@ -1039,19 +920,19 @@ /system/lib64/libRSCpuRef.so /system/lib64/libblas.so "/system/lib64/libsurfaceflinger.so" - + - "/system/framework/framework.jar" - "/system/framework/services.jar" - "/system/framework/arm64/apex.oat" - "/system/framework/arm64/apex-core-libart.oat" - "/apex/com.android.runtime/javalib/core-oj.jar" - "/apex/com.android.runtime/javalib/core-libart.jar" - "/apex/com.android.media/javalib/updatable-media.jar" - "/system/priv-app/SystemUI/SystemUI.apk" - "/system/lib64/libsurfaceflinger.so" + "/system/framework/framework.jar" + "/system/framework/services.jar" + "/system/framework/arm64/apex.oat" + "/system/framework/arm64/apex-core-libart.oat" + "/apex/com.android.runtime/javalib/core-oj.jar" + "/apex/com.android.runtime/javalib/core-libart.jar" + "/apex/com.android.media/javalib/updatable-media.jar" + "/system/priv-app/SystemUI/SystemUI.apk" + "/system/lib64/libsurfaceflinger.so" @@ -1060,40 +941,93 @@ true - - 0xFFFFFFFF - - 0xFFFFFFFF + + true + true - - 0xFFFFFFFF + + -1 - - false - - - true - - - true + + true true - - false + + + + + + "wifi,1,1,1,-1,true" + "mobile,0,0,0,-1,true" + "mobile_mms,2,0,4,60000,true" + "mobile_supl,3,0,2,60000,true" + "mobile_dun,4,0,2,60000,true" + "mobile_hipri,5,0,3,60000,true" + "mobile_fota,10,0,2,60000,true" + "mobile_ims,11,0,2,60000,true" + "mobile_cbs,12,0,2,60000,true" + "bluetooth,7,7,2,-1,true" + "mobile_emergency,15,0,5,-1,true" + "ethernet,9,9,9,-1,true" + - - true + + + + "1,1" + "0,1" + "7,1" + "9,1" + - - 2 + + + + "5gnr:2097152,6291456,16777216,512000,2097152,8388608" + "lte:2097152,4194304,8388608,262144,524288,1048576" + "lte_ca:4096,6291456,12582912,4096,1048576,2097152" + "umts:4094,87380,1220608,4096,16384,1220608" + "hspa:4094,87380,1220608,4096,16384,1220608" + "hsupa:4094,87380,1220608,4096,16384,1220608" + "hsdpa:4094,87380,1220608,4096,16384,1220608" + "hspap:4094,87380,1220608,4096,16384,1220608" + "edge:4093,26280,35040,4096,16384,35040" + "gprs:4092,8760,11680,4096,8760,11680" + "evdo:4094,87380,524288,4096,16384,262144" + + + + + true + + + true + + + true + + + false + + + true CDMA|EVDO|GSM|TD_SCDMA|WCDMA|LTE - - true + + false + + + true + + + true true - - true - - - true - - - false - - - true - - - true - - - true - - - true - - - false - - - 0 - - - true - - - -1 - - - true - - - "M50 0C77.6 0 100 22.4 100 50C100 77.6 77.6 100 50 100C22.4 100 0 77.6 0 50C0 22.4 22.4 0 50 0Z" - /sys/class/power_supply/battery/input_suspend 1 0 - - true + + + "usb\\d" + "rndis\\d" + - - true + + + "wlan0" + "softap0" + - - true + + + "bt-pan" + + + + true + + + + + 192.168.42.2 + 192.168.42.254 + 192.168.43.2 + 192.168.43.254 + 192.168.44.2 + 192.168.44.254 + 192.168.45.2 + 192.168.45.254 + 192.168.46.2 + 192.168.46.254 + 192.168.47.2 + 192.168.47.254 + 192.168.48.2 + 192.168.48.254 + 192.168.49.2 + 192.168.49.254 + 192.168.50.2 + 192.168.50.254 + 192.168.51.2 + 192.168.51.254 + + + + false + + + + 0 + 7 + 10 + + + + + 0 + 5 + 10 + + + + + 10 + + + + true + + + true + + + true + + + 524288,2097152,8388608,262144,524288,4194304 + + + -100 + -100 + -100 + -100 + + + true + + + true + + + + "softap1" + "softap2" + true @@ -1176,15 +1179,38 @@ true - - true + + false - - true + + true - - true + + true + + + true + + + true diff --git a/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml index 0d7d9357..ba57e801 100644 --- a/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml +++ b/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml @@ -18,6 +18,9 @@ --> + + false + true @@ -32,8 +35,5 @@ false - - - false diff --git a/overlay/frameworks/base/packages/SystemUI/res/values-sw600dp/dimens.xml b/overlay/frameworks/base/packages/SystemUI/res/values-sw600dp/dimens.xml index 355c1865..a070a02e 100644 --- a/overlay/frameworks/base/packages/SystemUI/res/values-sw600dp/dimens.xml +++ b/overlay/frameworks/base/packages/SystemUI/res/values-sw600dp/dimens.xml @@ -16,11 +16,11 @@ */ --> + + + 8dp 0dp - - 8dp - diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/config.xml index 5a8de5b7..1bf2b995 100644 --- a/overlay/frameworks/base/packages/SystemUI/res/values/config.xml +++ b/overlay/frameworks/base/packages/SystemUI/res/values/config.xml @@ -20,11 +20,12 @@ - - - false 6 7 + + + false + diff --git a/overlay/packages/apps/Bluetooth/res/values/config.xml b/overlay/packages/apps/Bluetooth/res/values/config.xml index 68b18d84..a1cdd788 100755 --- a/overlay/packages/apps/Bluetooth/res/values/config.xml +++ b/overlay/packages/apps/Bluetooth/res/values/config.xml @@ -31,7 +31,7 @@ --> true - true - false true + false + true diff --git a/overlay/packages/apps/CarrierConfig/res/xml/vendor_device.xml b/overlay/packages/apps/CarrierConfig/res/xml/vendor_device.xml index 12fd0cd9..87fb142b 100644 --- a/overlay/packages/apps/CarrierConfig/res/xml/vendor_device.xml +++ b/overlay/packages/apps/CarrierConfig/res/xml/vendor_device.xml @@ -101,4 +101,209 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + +351962000000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +64222022002 + + + + + + + + + + + + + + + + 5500 + + + + + + + + + + + + + 121 + + + + 123 + + + + + + + + + + + 22177 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + *123 + + + 131 + + + *20 + + + + + diff --git a/overlay/packages/apps/CarrierConfig/res/xml/vendor_miui.xml b/overlay/packages/apps/CarrierConfig/res/xml/vendor_miui.xml deleted file mode 100644 index 6339b06b..00000000 --- a/overlay/packages/apps/CarrierConfig/res/xml/vendor_miui.xml +++ /dev/null @@ -1,208 +0,0 @@ - - - - - - - - - - - - - - - - - - +351962000000 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +64222022002 - - - - - - - - - - - - - - - - 5500 - - - - - - - - - - - - - 121 - - - - 123 - - - - - - - - - - - 22177 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *123 - - - 131 - - - *20 - - - - - \ No newline at end of file diff --git a/overlay/packages/apps/Snap/res/values/config.xml b/overlay/packages/apps/Snap/res/values/config.xml index 30ee617b..70572740 100644 --- a/overlay/packages/apps/Snap/res/values/config.xml +++ b/overlay/packages/apps/Snap/res/values/config.xml @@ -14,12 +14,12 @@ - - true - false false + + + true diff --git a/overlay/packages/services/Telephony/res/values/config.xml b/overlay/packages/services/Telephony/res/values/config.xml index cca72cff..93fc384c 100644 --- a/overlay/packages/services/Telephony/res/values/config.xml +++ b/overlay/packages/services/Telephony/res/values/config.xml @@ -22,18 +22,14 @@ - - true - - - true true - + true + + + true + diff --git a/overlay/packages/services/Telephony/res/xml/telephony_injection.xml b/overlay/packages/services/Telephony/res/xml/telephony_injection.xml index 6ae6dfe5..6e0ef58d 100644 --- a/overlay/packages/services/Telephony/res/xml/telephony_injection.xml +++ b/overlay/packages/services/Telephony/res/xml/telephony_injection.xml @@ -32,14 +32,14 @@ --> + com.android.internal.telephony.dataconnection.DcTracker + com.android.internal.telephony.GsmCdmaPhone + com.android.internal.telephony.MultiSimSettingController + com.android.internal.telephony.PhoneSwitcher + com.android.internal.telephony.RIL com.android.internal.telephony.ServiceStateTracker com.android.internal.telephony.SubscriptionController com.android.internal.telephony.SubscriptionInfoUpdater - com.android.internal.telephony.GsmCdmaPhone - com.android.internal.telephony.PhoneSwitcher - com.android.internal.telephony.dataconnection.DcTracker - com.android.internal.telephony.RIL com.android.internal.telephony.TelephonyComponentFactory - com.android.internal.telephony.MultiSimSettingController diff --git a/sdm660.mk b/sdm660.mk index c1f6bd32..b6b61d1d 100644 --- a/sdm660.mk +++ b/sdm660.mk @@ -34,31 +34,296 @@ $(call inherit-product, vendor/xiaomi/sdm660-common/sdm660-common-vendor.mk) $(call inherit-product-if-exists, vendor/xiaomi/MiuiCamera/config.mk) $(call inherit-product-if-exists, vendor/gapps/common/common-vendor.mk) +# Common Tree Path COMMON_PATH := device/xiaomi/sdm660-common # Inherit properties -$(call inherit-product, $(COMMON_PATH)/properties.mk) +$(call inherit-product, $(COMMON_PATH)/common_prop.mk) -# Shims +# Audio PRODUCT_PACKAGES += \ - camera.sdm660_shim + android.hardware.audio@5.0-impl:32 \ + android.hardware.audio@2.0-service \ + android.hardware.audio.effect@5.0-impl:32 \ + android.hardware.audio.effect@2.0-service \ + android.hardware.soundtrigger@2.2-impl:32 \ + audio.a2dp.default \ + audio_amplifier.sdm660 \ + audio.primary.sdm660 \ + audio.r_submix.default \ + audio.usb.default \ + libaudio-resampler \ + libqcompostprocbundle \ + libqcomvisualizer \ + libqcomvoiceprocessing \ + libvolumelistener \ + tinymix.vendor -# RRO -PRODUCT_ENFORCE_RRO_TARGETS := \ - framework-res +# Audio Configs +PRODUCT_COPY_FILES += \ + $(COMMON_PATH)/configs/audio/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \ + $(COMMON_PATH)/configs/audio/audio_output_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_output_policy.conf \ + $(COMMON_PATH)/configs/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ + $(COMMON_PATH)/configs/audio/audio_tuning_mixer.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio_tuning_mixer.txt \ + $(COMMON_PATH)/configs/audio/graphite_ipc_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/graphite_ipc_platform_info.xml \ + $(COMMON_PATH)/configs/audio/listen_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/listen_platform_info.xml \ + $(COMMON_PATH)/configs/audio/sound_trigger_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths.xml \ + $(COMMON_PATH)/configs/audio/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_platform_info.xml + +# Audio Policy +PRODUCT_COPY_FILES += \ + $(TOPDIR)frameworks/av/services/audiopolicy/config/a2dp_in_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_in_audio_policy_configuration.xml \ + $(TOPDIR)frameworks/av/services/audiopolicy/config/bluetooth_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration.xml \ + $(TOPDIR)frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ + $(TOPDIR)frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \ + $(TOPDIR)frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \ + $(TOPDIR)frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml + +# ANT+ +PRODUCT_PACKAGES += \ + AntHalService \ + antradio_app \ + com.dsi.ant.antradio_library \ + libantradio + +# ANT Permission +PRODUCT_COPY_FILES += \ + external/ant-wireless/antradio-library/com.dsi.ant.antradio_library.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.dsi.ant.antradio_library.xml + +# AuthSecret +PRODUCT_PACKAGES += \ + android.hardware.authsecret@1.0-service + +# Biometrics +PRODUCT_PACKAGES += \ + android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sdm660 + +# Bluetooth +PRODUCT_PACKAGES += \ + audio.bluetooth.default \ + android.hardware.bluetooth.audio@2.0-impl \ + libbthost_if # Boot animation TARGET_BOOTANIMATION_SIZE := 1080p +# Broadcastradio +PRODUCT_PACKAGES += \ + android.hardware.broadcastradio@1.0-impl + +# Camera +PRODUCT_PACKAGES += \ + android.hardware.camera.provider@2.4-impl:32 \ + android.hardware.camera.provider@2.4-service \ + vendor.qti.hardware.camera.device@1.0 + +# Codec2 modules +PRODUCT_PACKAGES += \ + com.android.media.swcodec \ + libsfplugin_ccodec + +# Connectivity Engine support (CNE) +PRODUCT_PACKAGES += \ + cneapiclient \ + com.quicinc.cne \ + services-ext + +# Configstore +PRODUCT_PACKAGES += \ + android.hardware.configstore@1.0-service + +# Display +PRODUCT_PACKAGES += \ + android.frameworks.displayservice@1.0 \ + android.frameworks.displayservice@1.0_32 \ + android.hardware.graphics.allocator@2.0-impl:64 \ + android.hardware.graphics.allocator@2.0-service \ + android.hardware.graphics.composer@2.1-impl:64 \ + android.hardware.graphics.composer@2.1-service \ + android.hardware.graphics.mapper@2.0-impl-2.1 \ + android.hardware.memtrack@1.0-impl \ + android.hardware.memtrack@1.0-service \ + gralloc.sdm660 \ + hwcomposer.sdm660 \ + memtrack.sdm660 \ + libdisplayconfig \ + liboverlay \ + libqdMetaData \ + libqdMetaData.system \ + libtinyxml \ + vendor.display.config@1.1 \ + vendor.display.config@1.1_vendor + +# Doze +PRODUCT_PACKAGES += \ + XiaomiDoze + +# DRM +PRODUCT_PACKAGES += \ + android.hardware.drm@1.0-impl \ + android.hardware.drm@1.0-service \ + android.hardware.drm@1.2-service.clearkey + +# Folio +PRODUCT_PACKAGES += \ + folio_daemon + +# Freeform Multiwindow +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/android.software.freeform_window_management.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.freeform_window_management.xml + +# Fstab +PRODUCT_PACKAGES += \ + fstab.qcom + +# fwk-detect +PRODUCT_PACKAGES += \ + libqti_vndfwk_detect \ + libqti_vndfwk_detect.vendor + # GMS PRODUCT_GMS_CLIENTID_BASE := android-xiaomi -# Set boot SPL -BOOT_SECURITY_PATCH := $(PLATFORM_SECURITY_PATCH) +# GPS / Location +PRODUCT_PACKAGES += \ + android.hardware.gnss@1.0-impl-qti \ + android.hardware.gnss@1.0-service-qti \ + libgnss \ + libgnsspps \ + libsensorndkbridge \ + libsynergy_loc_api -# Soong -PRODUCT_SOONG_NAMESPACES += \ - $(COMMON_PATH) +PRODUCT_COPY_FILES += \ + $(COMMON_PATH)/configs/gps/apdr.conf:$(TARGET_COPY_OUT_VENDOR)/etc/apdr.conf \ + $(COMMON_PATH)/configs/gps/flp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/flp.conf \ + $(COMMON_PATH)/configs/gps/gps.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gps.conf \ + $(COMMON_PATH)/configs/gps/izat.conf:$(TARGET_COPY_OUT_VENDOR)/etc/izat.conf \ + $(COMMON_PATH)/configs/gps/lowi.conf:$(TARGET_COPY_OUT_VENDOR)/etc/lowi.conf \ + $(COMMON_PATH)/configs/gps/sap.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sap.conf \ + $(COMMON_PATH)/configs/gps/xtwifi.conf:$(TARGET_COPY_OUT_VENDOR)/etc/xtwifi.conf + +# Healthd +PRODUCT_PACKAGES += \ + android.hardware.health@2.0-service + +# HIDL +PRODUCT_PACKAGES += \ + android.hidl.base@1.0 \ + android.hidl.base@1.0_vendor + +# HW crypto +PRODUCT_PACKAGES += \ + vendor.qti.hardware.cryptfshw@1.0-service-qti + +# IDC +PRODUCT_COPY_FILES += \ + $(COMMON_PATH)/configs/idc/uinput-fpc.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/uinput-fpc.idc \ + $(COMMON_PATH)/configs/idc/uinput-goodix.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/uinput-goodix.idc + +# IFAAService +PRODUCT_PACKAGES += \ + IFAAService \ + org.ifaa.android.manager + +# IFAA JAR +PRODUCT_BOOT_JARS += \ + org.ifaa.android.manager + +# IMS +PRODUCT_PACKAGES += \ + ims-ext-common_system \ + ims_ext_common.xml \ + +# IMS JAR +PRODUCT_BOOT_JARS += \ + ims-ext-common_system + +# Init +PRODUCT_PACKAGES += \ + init.class_main.sh \ + init.goodix.sh \ + init.msm.usb.configfs.rc \ + init.qcom.post_boot.sh \ + init.qcom.rc \ + init.qcom.sh \ + init.qcom.usb.rc \ + init.qcom.usb.sh \ + init.qti.fm.sh \ + init.recovery.qcom.rc \ + init.target.rc \ + ueventd.qcom.rc + +# Ion +PRODUCT_PACKAGES += \ + libion + +# IPv6 +PRODUCT_PACKAGES += \ + ebtables \ + ethertypes \ + libebtc + +# IRQ +PRODUCT_COPY_FILES += \ + $(COMMON_PATH)/configs/msm_irqbalance.conf:$(TARGET_COPY_OUT_VENDOR)/etc/msm_irqbalance.conf + +# IRSC +PRODUCT_COPY_FILES += \ + $(COMMON_PATH)/configs/sec_config:$(TARGET_COPY_OUT_VENDOR)/etc/sec_config + +# Keylayout +PRODUCT_COPY_FILES += \ + $(COMMON_PATH)/configs/keylayout/uinput-fpc.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/uinput-fpc.kl \ + $(COMMON_PATH)/configs/keylayout/uinput-goodix.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/uinput-goodix.kl + +# Lights +PRODUCT_PACKAGES += \ + android.hardware.light@2.0-service.xiaomi_sdm660 + +# LiveDisplay native +PRODUCT_PACKAGES += \ + vendor.lineage.livedisplay@2.0-service-sdm + +# Media +PRODUCT_COPY_FILES += \ + $(COMMON_PATH)/configs/media/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \ + $(COMMON_PATH)/configs/media/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml + +# Media Google +PRODUCT_COPY_FILES += \ + frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml \ + frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_telephony.xml \ + frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video.xml \ + frameworks/av/media/libstagefright/data/media_codecs_google_video_le.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video_le.xml + +# Media Extensions +PRODUCT_PACKAGES += \ + libavmediaserviceextensions \ + libmediametrics \ + libregistermsext \ + mediametrics + +# Netutils +PRODUCT_PACKAGES += \ + android.system.net.netd@1.0 \ + libandroid_net \ + netutils-wrapper-1.0 + +# OMX +PRODUCT_PACKAGES += \ + libc2dcolorconvert \ + libextmedia_jni \ + libhypv_intercept \ + libmm-omxcore \ + libOmxCore \ + libOmxAacEnc \ + libOmxAmrEnc \ + libOmxEvrcEnc \ + libOmxG711Enc \ + libOmxQcelp13Enc \ + libOmxVdec \ + libOmxVenc \ + libstagefrighthw # Overlays DEVICE_PACKAGE_OVERLAYS += \ @@ -66,11 +331,6 @@ DEVICE_PACKAGE_OVERLAYS += \ $(COMMON_PATH)/overlay-lineage # Permissions -PRODUCT_COPY_FILES += \ - $(COMMON_PATH)/configs/privapp-permissions-qti-product.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/privapp-permissions-qti.xml \ - $(COMMON_PATH)/configs/privapp-permissions-qti-system.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-qti.xml \ - $(COMMON_PATH)/configs/privapp-permissions-hotword.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-hotword.xml - PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.audio.low_latency.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.audio.low_latency.xml \ frameworks/native/data/etc/android.hardware.audio.pro.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.audio.pro.xml \ @@ -114,275 +374,6 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.vulkan.version-1_0_3.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.version-1_0_3.xml \ frameworks/native/data/etc/android.hardware.ethernet.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.ethernet.xml -# Audio -PRODUCT_PACKAGES += \ - android.hardware.audio@5.0-impl:32 \ - android.hardware.audio@2.0-service \ - android.hardware.audio.effect@5.0-impl:32 \ - android.hardware.audio.effect@2.0-service \ - android.hardware.soundtrigger@2.2-impl:32 \ - audio.a2dp.default \ - audio_amplifier.sdm660 \ - audio.primary.sdm660 \ - audio.r_submix.default \ - audio.usb.default \ - libaudio-resampler \ - libqcompostprocbundle \ - libqcomvisualizer \ - libqcomvoiceprocessing \ - libvolumelistener \ - tinymix.vendor - -PRODUCT_PACKAGES += \ - audio.bluetooth.default \ - android.hardware.bluetooth.audio@2.0-impl - -PRODUCT_COPY_FILES += \ - $(COMMON_PATH)/audio/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \ - $(COMMON_PATH)/audio/audio_output_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_output_policy.conf \ - $(COMMON_PATH)/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ - $(COMMON_PATH)/audio/listen_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/listen_platform_info.xml \ - $(COMMON_PATH)/audio/sound_trigger_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths.xml \ - $(COMMON_PATH)/audio/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_platform_info.xml \ - $(COMMON_PATH)/audio/audio_tuning_mixer.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio_tuning_mixer.txt \ - $(COMMON_PATH)/audio/graphite_ipc_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/graphite_ipc_platform_info.xml - -PRODUCT_COPY_FILES += \ - $(TOPDIR)frameworks/av/services/audiopolicy/config/a2dp_in_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_in_audio_policy_configuration.xml \ - $(TOPDIR)frameworks/av/services/audiopolicy/config/bluetooth_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration.xml \ - $(TOPDIR)frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ - $(TOPDIR)frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \ - $(TOPDIR)frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \ - $(TOPDIR)frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml - -# ANT+ -PRODUCT_PACKAGES += \ - AntHalService \ - antradio_app \ - com.dsi.ant.antradio_library \ - libantradio - -PRODUCT_COPY_FILES += \ - external/ant-wireless/antradio-library/com.dsi.ant.antradio_library.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.dsi.ant.antradio_library.xml - -# AuthSecret -PRODUCT_PACKAGES += \ - android.hardware.authsecret@1.0-service - -# Biometrics -PRODUCT_PACKAGES += \ - android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sdm660 - -PRODUCT_PACKAGES += \ - IFAAService \ - org.ifaa.android.manager - -PRODUCT_BOOT_JARS += \ - org.ifaa.android.manager - -# Bluetooth -PRODUCT_PACKAGES += \ - libbthost_if - -PRODUCT_PACKAGES += \ - libMiWatermark_shim \ - -PRODUCT_PACKAGES += \ - android.frameworks.displayservice@1.0_32 \ - android.hardware.camera.provider@2.4-impl:32 \ - android.hardware.camera.provider@2.4-service \ - vendor.qti.hardware.camera.device@1.0 - -# Codec2 modules -PRODUCT_PACKAGES += \ - com.android.media.swcodec \ - libsfplugin_ccodec - -# Connectivity Engine support (CNE) -PRODUCT_PACKAGES += \ - cneapiclient \ - com.quicinc.cne \ - services-ext - -# Configstore -PRODUCT_PACKAGES += \ - android.hardware.configstore@1.0-service - -# Display -PRODUCT_PACKAGES += \ - gralloc.sdm660 \ - hwcomposer.sdm660 \ - memtrack.sdm660 \ - libdisplayconfig \ - liboverlay \ - libtinyxml \ - libqdMetaData \ - libqdMetaData.system - -PRODUCT_PACKAGES += \ - android.hardware.graphics.allocator@2.0-impl:64 \ - android.hardware.graphics.allocator@2.0-service \ - android.hardware.graphics.mapper@2.0-impl-2.1 \ - android.hardware.graphics.composer@2.1-impl:64 \ - android.hardware.graphics.composer@2.1-service \ - android.hardware.memtrack@1.0-impl \ - android.hardware.memtrack@1.0-service \ - android.hardware.renderscript@1.0-impl \ - android.frameworks.displayservice@1.0 \ - vendor.display.config@1.1 \ - vendor.display.config@1.1_vendor - -# Doze -PRODUCT_PACKAGES += \ - XiaomiDoze - -# DRM -PRODUCT_PACKAGES += \ - android.hardware.drm@1.0-impl \ - android.hardware.drm@1.0-service \ - android.hardware.drm@1.2-service.clearkey - -PRODUCT_PACKAGES += \ - android.hardware.broadcastradio@1.0-impl - -# Freeform Multiwindow -PRODUCT_COPY_FILES += \ - frameworks/native/data/etc/android.software.freeform_window_management.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.freeform_window_management.xml - -# Folio -PRODUCT_PACKAGES += \ - folio_daemon - -# fwk-detect -PRODUCT_PACKAGES += \ - libqti_vndfwk_detect \ - libqti_vndfwk_detect.vendor - - -# GPS / Location -PRODUCT_PACKAGES += \ - android.hardware.gnss@1.0-impl-qti \ - android.hardware.gnss@1.0-service-qti \ - libgnss \ - libgnsspps \ - libsensorndkbridge \ - libsynergy_loc_api - -PRODUCT_COPY_FILES += \ - $(COMMON_PATH)/configs/gps/apdr.conf:$(TARGET_COPY_OUT_VENDOR)/etc/apdr.conf \ - $(COMMON_PATH)/configs/gps/flp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/flp.conf \ - $(COMMON_PATH)/configs/gps/gps.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gps.conf \ - $(COMMON_PATH)/configs/gps/izat.conf:$(TARGET_COPY_OUT_VENDOR)/etc/izat.conf \ - $(COMMON_PATH)/configs/gps/lowi.conf:$(TARGET_COPY_OUT_VENDOR)/etc/lowi.conf \ - $(COMMON_PATH)/configs/gps/sap.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sap.conf \ - $(COMMON_PATH)/configs/gps/xtwifi.conf:$(TARGET_COPY_OUT_VENDOR)/etc/xtwifi.conf - -# Healthd -PRODUCT_PACKAGES += \ - android.hardware.health@2.0-service - -# HIDL -PRODUCT_PACKAGES += \ - android.hidl.base@1.0 \ - android.hidl.base@1.0_vendor - -# HW crypto -PRODUCT_PACKAGES += \ - vendor.qti.hardware.cryptfshw@1.0-service-qti - -# IDC -PRODUCT_COPY_FILES += \ - $(COMMON_PATH)/idc/uinput-fpc.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/uinput-fpc.idc \ - $(COMMON_PATH)/idc/uinput-goodix.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/uinput-goodix.idc - -# Init -PRODUCT_PACKAGES += \ - init.class_main.sh \ - init.goodix.sh \ - move_wifi_data.sh \ - init.msm.usb.configfs.rc \ - init.qcom.post_boot.sh \ - init.qcom.rc \ - init.qcom.sh \ - init.qcom.usb.rc \ - init.qcom.usb.sh \ - init.qti.fm.sh \ - init.recovery.qcom.rc \ - init.target.rc \ - ueventd.qcom.rc \ - fstab.qcom - -# Ion -PRODUCT_PACKAGES += \ - libion - -# IPv6 -PRODUCT_PACKAGES += \ - ebtables \ - ethertypes \ - libebtc - -# IRQ -PRODUCT_COPY_FILES += \ - $(COMMON_PATH)/configs/msm_irqbalance.conf:$(TARGET_COPY_OUT_VENDOR)/etc/msm_irqbalance.conf - -# IRSC -PRODUCT_COPY_FILES += \ - $(COMMON_PATH)/configs/sec_config:$(TARGET_COPY_OUT_VENDOR)/etc/sec_config - -# Keylayout -PRODUCT_COPY_FILES += \ - $(COMMON_PATH)/configs/keylayout/uinput-fpc.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/uinput-fpc.kl \ - $(COMMON_PATH)/configs/keylayout/uinput-goodix.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/uinput-goodix.kl - -# Lights -PRODUCT_PACKAGES += \ - android.hardware.light@2.0-service.xiaomi_sdm660 - -# LiveDisplay native -PRODUCT_PACKAGES += \ - vendor.lineage.livedisplay@2.0-service-sdm - -# Media -PRODUCT_COPY_FILES += \ - $(COMMON_PATH)/configs/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \ - $(COMMON_PATH)/configs/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml - -PRODUCT_COPY_FILES += \ - frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml \ - frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_telephony.xml \ - frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video.xml \ - frameworks/av/media/libstagefright/data/media_codecs_google_video_le.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video_le.xml - -# Media Extensions -PRODUCT_PACKAGES += \ - libavmediaserviceextensions \ - libmediametrics \ - libregistermsext \ - mediametrics - -# Netutils -PRODUCT_PACKAGES += \ - android.system.net.netd@1.0 \ - libandroid_net \ - netutils-wrapper-1.0 - -# OMX -PRODUCT_PACKAGES += \ - libc2dcolorconvert \ - libextmedia_jni \ - libhypv_intercept \ - libmm-omxcore \ - libOmxCore \ - libOmxAacEnc \ - libOmxAmrEnc \ - libOmxEvrcEnc \ - libOmxG711Enc \ - libOmxQcelp13Enc \ - libOmxVdec \ - libOmxVenc \ - libstagefrighthw - # Power PRODUCT_PACKAGES += \ android.hardware.power@1.2-service-qti @@ -390,6 +381,12 @@ PRODUCT_PACKAGES += \ # Preopt SystemUI PRODUCT_DEXPREOPT_SPEED_APPS += SystemUI +# Privapp-Permissions +PRODUCT_COPY_FILES += \ + $(COMMON_PATH)/configs/privapp-permission/privapp-permissions-qti-product.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/privapp-permissions-qti.xml \ + $(COMMON_PATH)/configs/privapp-permission/privapp-permissions-qti-system.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-qti.xml \ + $(COMMON_PATH)/configs/privapp-permission/privapp-permissions-hotword.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-hotword.xml + # Public Libraries PRODUCT_COPY_FILES += \ $(COMMON_PATH)/configs/public.libraries.txt:$(TARGET_COPY_OUT_VENDOR)/etc/public.libraries.txt @@ -397,7 +394,7 @@ PRODUCT_COPY_FILES += \ # Low power Whitelist PRODUCT_COPY_FILES += \ $(COMMON_PATH)/configs/qti_whitelist.xml:system/etc/sysconfig/qti_whitelist.xml \ - $(COMMON_PATH)/configs/whitelistedapps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/whitelistedapps.xml \ + $(COMMON_PATH)/configs/perf/whitelistedapps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/whitelistedapps.xml \ # QMI PRODUCT_PACKAGES += \ @@ -424,24 +421,24 @@ PRODUCT_PACKAGES += \ android.hardware.radio@1.2 \ android.hardware.radio.config@1.0 \ android.hardware.secure_element@1.0 \ - rild \ librmnetctl \ libxml2 \ - libprotobuf-cpp-full - -PRODUCT_PACKAGES += \ - ims-ext-common_system \ - ims_ext_common.xml \ + libprotobuf-cpp-full \ qti-telephony-hidl-wrapper \ qti_telephony_hidl_wrapper.xml \ qti-telephony-utils \ qti_telephony_utils.xml \ + rild \ telephony-ext +# RIL JAR PRODUCT_BOOT_JARS += \ - ims-ext-common_system \ telephony-ext +# RRO +PRODUCT_ENFORCE_RRO_TARGETS := \ + framework-res + # Seccomp policy PRODUCT_COPY_FILES += \ $(COMMON_PATH)/seccomp/mediacodec-seccomp.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediacodec.policy \ @@ -452,8 +449,21 @@ PRODUCT_PACKAGES += \ android.hardware.sensors@1.0-impl:64 \ android.hardware.sensors@1.0-service +# Sensor Config PRODUCT_COPY_FILES += \ - $(COMMON_PATH)/sensors/hals.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/hals.conf + $(COMMON_PATH)/configs/sensors/hals.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/hals.conf + +# Security Patch +BOOT_SECURITY_PATCH := $(PLATFORM_SECURITY_PATCH) + +# Shims +PRODUCT_PACKAGES += \ + camera.sdm660_shim \ + libMiWatermark_shim + +# Soong +PRODUCT_SOONG_NAMESPACES += \ + $(COMMON_PATH) # Tetheroffload PRODUCT_PACKAGES += \ @@ -473,7 +483,7 @@ PRODUCT_PACKAGES += \ android.hardware.thermal@1.0-service \ thermal.sdm660 -# ThermalController app +# Thermal Controller PRODUCT_PACKAGES += \ ThermalController @@ -488,7 +498,7 @@ PRODUCT_PACKAGES += \ vndk-ext \ vndk_package -# Wifi +# WiFi PRODUCT_PACKAGES += \ android.hardware.wifi@1.0-service \ hostapd \ @@ -498,16 +508,18 @@ PRODUCT_PACKAGES += \ wpa_supplicant.conf \ wpa_cli +# WiFi Configs PRODUCT_COPY_FILES += \ - $(COMMON_PATH)/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \ - $(COMMON_PATH)/wifi/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf \ - $(COMMON_PATH)/wifi/WCNSS_qcom_cfg.ini:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/WCNSS_qcom_cfg.ini + $(COMMON_PATH)/configs/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \ + $(COMMON_PATH)/configs/wifi/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf \ + $(COMMON_PATH)/configs/wifi/WCNSS_qcom_cfg.ini:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/WCNSS_qcom_cfg.ini # WiFi Display PRODUCT_PACKAGES += \ libaacwrapper \ libnl +# WiFi Display JAR PRODUCT_BOOT_JARS += \ WfdCommon