From 3fe8b4ed6a5fdb58b23dc738d676558c07056fe2 Mon Sep 17 00:00:00 2001 From: Omkar Chandorkar Date: Sat, 8 Oct 2022 10:57:07 +0530 Subject: [PATCH] sm8150-common: cleanup boardconfig and device makefiles Change-Id: Iefb6dffcd07e8e6cb2d4c9df42388cfd89a5bda7 Signed-off-by: Omkar Chandorkar --- BoardConfigCommon.mk | 106 +++++++++-------- common.mk | 263 +++++++++++++++++++++---------------------- 2 files changed, 186 insertions(+), 183 deletions(-) diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 7e85da91..ae6fadee 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -4,41 +4,10 @@ # SPDX-License-Identifier: Apache-2.0 # -BUILD_BROKEN_DUP_RULES := true -BUILD_BROKEN_ELF_PREBUILT_PRODUCT_COPY_FILES := true - BOARD_VENDOR := oneplus VENDOR_PATH := device/oneplus/sm8150-common -# Architecture -TARGET_ARCH := arm64 -TARGET_ARCH_VARIANT := armv8-2a-dotprod -TARGET_CPU_ABI := arm64-v8a -TARGET_CPU_VARIANT := cortex-a55 - -TARGET_2ND_ARCH := arm -TARGET_2ND_ARCH_VARIANT := armv8-2a -TARGET_2ND_CPU_ABI := armeabi-v7a -TARGET_2ND_CPU_ABI2 := armeabi -TARGET_2ND_CPU_VARIANT := cortex-a55 - -# Bootloader -TARGET_BOOTLOADER_BOARD_NAME := msmnile -TARGET_NO_BOOTLOADER := true - -# Kernel -BOARD_BOOT_HEADER_VERSION := 2 -BOARD_KERNEL_BASE := 0x00000000 -BOARD_KERNEL_CMDLINE := androidboot.hardware=qcom androidboot.console=ttyMSM0 androidboot.memcg=1 lpm_levels.sleep_disabled=1 msm_rtb.filter=0x237 service_locator.enable=1 swiotlb=2048 loop.max_part=7 androidboot.usbcontroller=a600000.dwc3 kpti=off -BOARD_KERNEL_CMDLINE += androidboot.vbmeta.avb_version=1.0 -BOARD_KERNEL_PAGESIZE := 4096 -BOARD_KERNEL_SEPARATED_DTBO := true -BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION) -BOARD_RAMDISK_USE_LZ4 := true -KERNEL_DEFCONFIG := vendor/sm8150-perf_defconfig -KERNEL_CUSTOM_LLVM := true - # A/B AB_OTA_UPDATER := true @@ -58,10 +27,33 @@ AB_OTA_PARTITIONS += \ vbmeta_system endif +# Architecture +TARGET_ARCH := arm64 +TARGET_ARCH_VARIANT := armv8-2a-dotprod +TARGET_CPU_ABI := arm64-v8a +TARGET_CPU_VARIANT := cortex-a55 + +TARGET_2ND_ARCH := arm +TARGET_2ND_ARCH_VARIANT := armv8-2a +TARGET_2ND_CPU_ABI := armeabi-v7a +TARGET_2ND_CPU_ABI2 := armeabi +TARGET_2ND_CPU_VARIANT := cortex-a55 + +# Bootloader +TARGET_BOOTLOADER_BOARD_NAME := msmnile +TARGET_NO_BOOTLOADER := true + +# Display +TARGET_RECOVERY_UI_MARGIN_HEIGHT := 80 + # FOD TARGET_USES_FOD_ZPOS := true TARGET_SURFACEFLINGER_UDFPS_LIB := //device/oneplus/common:libudfps_extension.oneplus +# Hacks +BUILD_BROKEN_DUP_RULES := true +BUILD_BROKEN_ELF_PREBUILT_PRODUCT_COPY_FILES := true + # HIDL DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE += \ $(VENDOR_PATH)/configs/vintf/oneplus_vendor_framework_compatibility_matrix.xml @@ -72,19 +64,48 @@ DEVICE_MANIFEST_FILE += $(VENDOR_PATH)/configs/vintf/manifest.xml ODM_MANIFEST_FILES += $(VENDOR_PATH)/configs/vintf/manifest-qva.xml # Init +SOONG_CONFIG_NAMESPACES += ONEPLUS_MSMNILE_INIT +SOONG_CONFIG_ONEPLUS_MSMNILE_INIT := PARTITION_SCHEME +ifeq ($(PRODUCT_USE_DYNAMIC_PARTITIONS),true) +SOONG_CONFIG_ONEPLUS_MSMNILE_INIT_PARTITION_SCHEME := dynamic +else +SOONG_CONFIG_ONEPLUS_MSMNILE_INIT_PARTITION_SCHEME := non_dynamic +endif TARGET_INIT_VENDOR_LIB := //$(VENDOR_PATH):libinit_oneplus-sm8150 TARGET_RECOVERY_DEVICE_MODULES := libinit_oneplus-sm8150 +# Kernel +BOARD_BOOT_HEADER_VERSION := 2 +BOARD_KERNEL_BASE := 0x00000000 +BOARD_KERNEL_CMDLINE := \ + androidboot.console=ttyMSM0 \ + androidboot.hardware=qcom \ + androidboot.memcg=1 \ + androidboot.usbcontroller=a600000.dwc3 \ + androidboot.vbmeta.avb_version=1.0 \ + loop.max_part=7 \ + lpm_levels.sleep_disabled=1 \ + msm_rtb.filter=0x237 \ + service_locator.enable=1 \ + swiotlb=2048 +BOARD_KERNEL_PAGESIZE := 4096 +BOARD_KERNEL_SEPARATED_DTBO := true +BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION) +BOARD_RAMDISK_USE_LZ4 := true +KERNEL_DEFCONFIG := vendor/sm8150-perf_defconfig +KERNEL_CUSTOM_LLVM := true + # Metadata BOARD_USES_METADATA_PARTITION := true # Partitions ifeq ($(PRODUCT_USE_DYNAMIC_PARTITIONS),true) -BOARD_SUPER_PARTITION_SIZE := 15032385536 -BOARD_SUPER_PARTITION_GROUPS := oneplus_dynamic_partitions BOARD_ONEPLUS_DYNAMIC_PARTITIONS_PARTITION_LIST := odm product system system_ext vendor BOARD_ONEPLUS_DYNAMIC_PARTITIONS_SIZE := 7511998464 BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := erofs +BOARD_RECOVERYIMAGE_PARTITION_SIZE := 100663296 +BOARD_SUPER_PARTITION_GROUPS := oneplus_dynamic_partitions +BOARD_SUPER_PARTITION_SIZE := 15032385536 BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := erofs TARGET_COPY_OUT_PRODUCT := product TARGET_COPY_OUT_SYSTEM_EXT := system_ext @@ -96,16 +117,15 @@ BOARD_VENDORIMAGE_PARTITION_SIZE := 1073741824 endif BOARD_BOOTIMAGE_PARTITION_SIZE := 100663296 BOARD_DTBOIMG_PARTITION_SIZE := 25165824 -BOARD_RECOVERYIMAGE_PARTITION_SIZE := 100663296 -BOARD_USERDATAIMAGE_PARTITION_SIZE := 115601780736 +BOARD_EROFS_COMPRESSOR := lz4 +BOARD_EROFS_PCLUSTER_SIZE := 262144 BOARD_FLASH_BLOCK_SIZE := 262144 # (BOARD_KERNEL_PAGESIZE * 64) BOARD_ODMIMAGE_FILE_SYSTEM_TYPE := erofs BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := erofs BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE := f2fs +BOARD_USERDATAIMAGE_PARTITION_SIZE := 115601780736 BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := erofs PRODUCT_FS_COMPRESSION := 1 -BOARD_EROFS_COMPRESSOR := lz4 -BOARD_EROFS_PCLUSTER_SIZE := 262144 TARGET_COPY_OUT_ODM := odm TARGET_COPY_OUT_VENDOR := vendor @@ -125,18 +145,6 @@ BOARD_INCLUDE_RECOVERY_DTBO := true TARGET_RECOVERY_PIXEL_FORMAT := RGBX_8888 TARGET_USERIMAGES_USE_F2FS := true -# Init -SOONG_CONFIG_NAMESPACES += ONEPLUS_MSMNILE_INIT -SOONG_CONFIG_ONEPLUS_MSMNILE_INIT := PARTITION_SCHEME -ifeq ($(PRODUCT_USE_DYNAMIC_PARTITIONS),true) -SOONG_CONFIG_ONEPLUS_MSMNILE_INIT_PARTITION_SCHEME := dynamic -else -SOONG_CONFIG_ONEPLUS_MSMNILE_INIT_PARTITION_SCHEME := non_dynamic -endif - -# Display -TARGET_RECOVERY_UI_MARGIN_HEIGHT := 80 - # Sepolicy BOARD_VENDOR_SEPOLICY_DIRS += $(VENDOR_PATH)/sepolicy/vendor PRODUCT_PRIVATE_SEPOLICY_DIRS += $(VENDOR_PATH)/sepolicy/private diff --git a/common.mk b/common.mk index 56f764df..b95cf6ae 100644 --- a/common.mk +++ b/common.mk @@ -7,17 +7,6 @@ # Get non-open-source specific aspects $(call inherit-product, vendor/oneplus/sm8150-common/sm8150-common-vendor.mk) -# Project ID Quota -$(call inherit-product, $(SRC_TARGET_DIR)/product/emulated_storage.mk) - -# Overlays -PRODUCT_PACKAGES += \ - AOSPAOnePlusSM8150Frameworks \ - AOSPAOnePlusSM8150SystemUI \ - OnePlusSM8150Frameworks \ - OnePlusSM8150Settings \ - OnePlusSM8150SystemUI - # A/B AB_OTA_POSTINSTALL_CONFIG += \ RUN_POSTINSTALL_vendor=true \ @@ -31,40 +20,8 @@ AB_OTA_POSTINSTALL_CONFIG += \ FILESYSTEM_TYPE_system=erofs \ POSTINSTALL_OPTIONAL_system=true -# Permissions -PRODUCT_COPY_FILES += \ - frameworks/native/data/etc/android.hardware.camera.flash-autofocus.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.flash-autofocus.xml \ - frameworks/native/data/etc/android.hardware.camera.front.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.front.xml \ - frameworks/native/data/etc/android.hardware.camera.full.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.full.xml \ - frameworks/native/data/etc/android.hardware.camera.raw.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.raw.xml \ - frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml \ - frameworks/native/data/etc/android.hardware.location.gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.location.gps.xml \ - frameworks/native/data/etc/android.hardware.nfc.hce.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.hce.xml \ - frameworks/native/data/etc/android.hardware.nfc.hcef.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.hcef.xml \ - frameworks/native/data/etc/android.hardware.nfc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.xml \ - frameworks/native/data/etc/android.hardware.sensor.accelerometer.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.accelerometer.xml \ - frameworks/native/data/etc/android.hardware.sensor.compass.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.compass.xml \ - frameworks/native/data/etc/android.hardware.sensor.gyroscope.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.gyroscope.xml \ - frameworks/native/data/etc/android.hardware.sensor.light.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.light.xml \ - frameworks/native/data/etc/android.hardware.sensor.proximity.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.proximity.xml \ - frameworks/native/data/etc/android.hardware.sensor.stepcounter.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.stepcounter.xml \ - frameworks/native/data/etc/android.hardware.sensor.stepdetector.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.stepdetector.xml \ - frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml \ - frameworks/native/data/etc/android.hardware.wifi.passpoint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.passpoint.xml \ - frameworks/native/data/etc/android.hardware.wifi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.xml \ - frameworks/native/data/etc/android.software.ipsec_tunnels.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.ipsec_tunnels.xml \ - frameworks/native/data/etc/android.software.device_id_attestation.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.device_id_attestation.xml \ - frameworks/native/data/etc/android.software.ipsec_tunnels.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.ipsec_tunnels.xml \ - frameworks/native/data/etc/android.software.sip.voip.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.sip.voip.xml \ - frameworks/native/data/etc/android.software.verified_boot.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.verified_boot.xml \ - frameworks/native/data/etc/com.nxp.mifare.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.nxp.mifare.xml - -# Atrace -PRODUCT_PACKAGES += \ - android.hardware.atrace@1.0-service - # Audio -PRODUCT_PROPERTY_OVERRIDES += \ +PRODUCT_VENDOR_PROPERTIES += \ af.fast_track_multiplier=2 \ audio.deep_buffer.media=true \ persist.vendor.audio_hal.dsp_bit_width_enforce_mode=24 \ @@ -85,31 +42,12 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/audio/audio_io_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_io_policy.conf \ $(LOCAL_PATH)/configs/audio/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info.xml \ $(LOCAL_PATH)/configs/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ - $(LOCAL_PATH)/configs/audio/sound_trigger_mixer_paths_wcd9340.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths_wcd9340.xml \ - $(LOCAL_PATH)/configs/audio/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_platform_info.xml - -PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/audio/bluetooth_hearing_aid_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_hearing_aid_audio_policy_configuration.xml \ + $(LOCAL_PATH)/configs/audio/sound_trigger_mixer_paths_wcd9340.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths_wcd9340.xml \ + $(LOCAL_PATH)/configs/audio/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_platform_info.xml \ frameworks/av/services/audiopolicy/config/a2dp_in_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_in_audio_policy_configuration.xml \ frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml -# Boot control -PRODUCT_PACKAGES += \ - android.hardware.boot@1.1-impl-qti:64 \ - android.hardware.boot@1.1-impl-qti.recovery \ - android.hardware.boot@1.1-service - -# Use FUSE passthrough -PRODUCT_PRODUCT_PROPERTIES += \ - persist.sys.fuse.passthrough.enable=true - -# Automatic refresh rate switching for power savings -PRODUCT_PROPERTY_OVERRIDES += \ - ro.surface_flinger.set_idle_timer_ms=1500 \ - ro.surface_flinger.set_touch_timer_ms=1500 \ - ro.surface_flinger.set_display_power_timer_ms=1500 \ - ro.surface_flinger.use_content_detection_for_refresh_rate=true - # Bluetooth PRODUCT_PACKAGES += \ android.hardware.bluetooth.audio@2.0-impl:32 \ @@ -128,16 +66,19 @@ PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.qcom.bluetooth.enable.splita2dp=true \ persist.vendor.qcom.bluetooth.scram.enabled=true \ persist.vendor.qcom.bluetooth.soc=cherokee \ - persist.vendor.qcom.bluetooth.twsp_state.enabled=false + persist.vendor.qcom.bluetooth.twsp_state.enabled=false \ + vendor.bluetooth.soc=cherokee \ + vendor.hw.fm.init=0 PRODUCT_SYSTEM_EXT_PROPERTIES += \ - bt.max.hfpclient.connections=1 \ - vendor.bluetooth.soc=cherokee \ - persist.vendor.btstack.enable.lpa=true \ - persist.vendor.btstack.enable.twsplus=true \ - persist.vendor.bt.a2dp.aac_whitelist=false \ persist.vendor.bt.a2dp.hal.implementation=true +# Boot control +PRODUCT_PACKAGES += \ + android.hardware.boot@1.1-impl-qti:64 \ + android.hardware.boot@1.1-impl-qti.recovery \ + android.hardware.boot@1.1-service + # Camera PRODUCT_PACKAGES += \ android.frameworks.displayservice@1.0 \ @@ -154,39 +95,33 @@ PRODUCT_SYSTEM_EXT_PROPERTIES += \ persist.vendor.camera.privapp.list=com.oneplus.camera \ vendor.camera.aux.packagelist=org.codeaurora.snapcam,com.oneplus.camera +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/android.hardware.camera.flash-autofocus.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.flash-autofocus.xml \ + frameworks/native/data/etc/android.hardware.camera.front.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.front.xml \ + frameworks/native/data/etc/android.hardware.camera.full.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.full.xml \ + frameworks/native/data/etc/android.hardware.camera.raw.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.raw.xml + # Charger PRODUCT_SYSTEM_EXT_PROPERTIES += \ ro.charger.enable_suspend=true -# Common init scripts -PRODUCT_PACKAGES += \ - init.class_main.sh \ - init.oem.rc \ - init.oneplus.usb.rc \ - init.qcom.class_core.sh \ - init.qcom.early_boot.sh \ - init.qcom.post_boot.sh \ - init.qcom.rc \ - init.qcom.sensors.sh \ - init.qcom.sh \ - init.qti.chg_policy.sh \ - init.qti.dcvs.sh \ - init.qti.qcv.sh \ - init.recovery.qcom.rc \ - init.target.rc \ - fstab.qcom \ - ueventd.qcom.rc +# Dalvik +$(call inherit-product, frameworks/native/build/phone-xhdpi-6144-dalvik-heap.mk) -# Crypto -PRODUCT_VENDOR_PROPERTIES += \ - ro.crypto.allow_encrypt_override=true \ - ro.crypto.volume.filenames_mode="aes-256-cts" \ - ro.hardware.keystore_desede=true +# Device ID attestation +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/android.software.device_id_attestation.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.device_id_attestation.xml # Display PRODUCT_PACKAGES += \ vendor.oneplus.hardware.display@1.0.vendor +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ + ro.surface_flinger.set_idle_timer_ms=1500 \ + ro.surface_flinger.set_touch_timer_ms=1500 \ + ro.surface_flinger.set_display_power_timer_ms=1500 \ + ro.surface_flinger.use_content_detection_for_refresh_rate=true + PRODUCT_VENDOR_PROPERTIES += \ ro.vendor.display.ad.hdr_calib_data=/vendor/etc/hdr_config.cfg \ ro.vendor.display.ad.sdr_calib_data=/vendor/etc/sdr_config.cfg \ @@ -195,13 +130,11 @@ PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.color.matrix=2 \ vendor.display.disable_mask_layer_hint=1 -PRODUCT_SYSTEM_EXT_PROPERTIES += \ - debug.sf.enable_hwc_vds=1 - # Display Mode PRODUCT_PACKAGES += \ DisplayMode +# DPM PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.dpmhalservice.enable=1 @@ -228,6 +161,9 @@ PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.qfp=true \ vendor.boot.fingerprintbstate=orange +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml + # FRP PRODUCT_VENDOR_PROPERTIES += \ ro.frp.pst=/dev/block/bootdevice/by-name/config @@ -246,16 +182,44 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/gps/sap.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sap.conf \ $(LOCAL_PATH)/configs/gps/xtwifi.conf:$(TARGET_COPY_OUT_VENDOR)/etc/xtwifi.conf +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/android.hardware.location.gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.location.gps.xml + # Health PRODUCT_PACKAGES += \ android.hardware.health@2.1-impl-qti:64 \ android.hardware.health@2.1-service +# Init +PRODUCT_PACKAGES += \ + init.class_main.sh \ + init.oem.rc \ + init.oneplus.usb.rc \ + init.qcom.class_core.sh \ + init.qcom.early_boot.sh \ + init.qcom.post_boot.sh \ + init.qcom.rc \ + init.qcom.sensors.sh \ + init.qcom.sh \ + init.qti.chg_policy.sh \ + init.qti.dcvs.sh \ + init.qti.qcv.sh \ + init.recovery.qcom.rc \ + init.target.rc \ + fstab.qcom \ + ueventd.qcom.rc + # Input PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/keylayout/gf_input.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/gf_input.kl \ $(LOCAL_PATH)/configs/keylayout/gpio-keys.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/gpio-keys.kl +# Keymaster +PRODUCT_VENDOR_PROPERTIES += \ + ro.crypto.allow_encrypt_override=true \ + ro.crypto.volume.filenames_mode="aes-256-cts" \ + ro.hardware.keystore_desede=true + # NFC PRODUCT_PACKAGES += \ android.hardware.nfc@1.0-impl:64 \ @@ -265,6 +229,20 @@ PRODUCT_PACKAGES += \ PRODUCT_VENDOR_PROPERTIES += \ ro.camera.notify_nfc=1 +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/android.hardware.nfc.hce.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.hce.xml \ + frameworks/native/data/etc/android.hardware.nfc.hcef.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.hcef.xml \ + frameworks/native/data/etc/android.hardware.nfc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.xml \ + frameworks/native/data/etc/com.nxp.mifare.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.nxp.mifare.xml + +# Overlays +PRODUCT_PACKAGES += \ + AOSPAOnePlusSM8150Frameworks \ + AOSPAOnePlusSM8150SystemUI \ + OnePlusSM8150Frameworks \ + OnePlusSM8150Settings \ + OnePlusSM8150SystemUI + # Platform TARGET_BOARD_PLATFORM := msmnile @@ -282,41 +260,16 @@ TARGET_COMMON_QTI_COMPONENTS := \ usb \ wfd -# USB -PRODUCT_PROPERTY_OVERRIDES += \ - vendor.usb.diag.func.name=diag \ - vendor.usb.use_ffs_mtp=0 - -# Enable incrementalfs -PRODUCT_PROPERTY_OVERRIDES += \ - ro.incremental.enable=yes - -# Vibrator -PRODUCT_PACKAGES += \ - vendor.qti.hardware.vibrator.service.oneplus - -PRODUCT_COPY_FILES += \ - vendor/qcom/opensource/vibrator/excluded-input-devices.xml:$(TARGET_COPY_OUT_VENDOR)/etc/excluded-input-devices.xml - -# VNDK -PRODUCT_EXTRA_VNDK_VERSIONS := 30 - -PRODUCT_PACKAGES += \ - android.hardware.audio@4.0.vendor:64 \ - android.hardware.bluetooth@1.1.vendor \ - android.hardware.drm@1.4.vendor \ - android.hardware.gatekeeper@1.0.vendor \ - android.hardware.gnss@2.1.vendor \ - android.hardware.keymaster@4.1.vendor \ - android.hardware.neuralnetworks@1.3.vendor \ - android.hardware.nfc@1.2.vendor \ - android.hardware.radio.config@1.2.vendor \ - android.hardware.radio.deprecated@1.0.vendor \ - android.hardware.radio@1.5.vendor \ - android.hardware.secure_element@1.2.vendor \ - android.system.net.netd@1.1.vendor - # Sensors +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/android.hardware.sensor.accelerometer.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.accelerometer.xml \ + frameworks/native/data/etc/android.hardware.sensor.compass.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.compass.xml \ + frameworks/native/data/etc/android.hardware.sensor.gyroscope.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.gyroscope.xml \ + frameworks/native/data/etc/android.hardware.sensor.light.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.light.xml \ + frameworks/native/data/etc/android.hardware.sensor.proximity.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.proximity.xml \ + frameworks/native/data/etc/android.hardware.sensor.stepcounter.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.stepcounter.xml \ + frameworks/native/data/etc/android.hardware.sensor.stepdetector.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.stepdetector.xml \ + PRODUCT_PACKAGES += \ als_correction_service.oneplus_msmnile \ android.hardware.sensors@2.0-service.oneplus_msmnile \ @@ -331,6 +284,13 @@ PRODUCT_SOONG_NAMESPACES += \ $(LOCAL_PATH) \ device/oneplus/common +# Storage +PRODUCT_VENDOR_PROPERTIES += \ + persist.sys.fuse.passthrough.enable=true \ + ro.incremental.enable=yes + +$(call inherit-product, $(SRC_TARGET_DIR)/product/emulated_storage.mk) + # Subsystem silent restart PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.ssr.restart_level=ALL_ENABLE @@ -346,8 +306,37 @@ PRODUCT_PACKAGES += \ update_engine_sideload \ update_verifier -PRODUCT_PACKAGES_DEBUG += \ - update_engine_client +# USB +PRODUCT_PROPERTY_OVERRIDES += \ + vendor.usb.diag.func.name=diag \ + vendor.usb.use_ffs_mtp=0 + +# Verified Boot +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/android.software.verified_boot.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.verified_boot.xml + +# Vibrator +PRODUCT_PACKAGES += \ + vendor.qti.hardware.vibrator.service.oneplus + +PRODUCT_COPY_FILES += \ + vendor/qcom/opensource/vibrator/excluded-input-devices.xml:$(TARGET_COPY_OUT_VENDOR)/etc/excluded-input-devices.xml + +# VNDK +PRODUCT_PACKAGES += \ + android.hardware.audio@4.0.vendor:64 \ + android.hardware.bluetooth@1.1.vendor \ + android.hardware.drm@1.4.vendor \ + android.hardware.gatekeeper@1.0.vendor \ + android.hardware.gnss@2.1.vendor \ + android.hardware.keymaster@4.1.vendor \ + android.hardware.neuralnetworks@1.3.vendor \ + android.hardware.nfc@1.2.vendor \ + android.hardware.radio.config@1.2.vendor \ + android.hardware.radio.deprecated@1.0.vendor \ + android.hardware.radio@1.5.vendor \ + android.hardware.secure_element@1.2.vendor \ + android.system.net.netd@1.1.vendor # Wifi PRODUCT_PACKAGES += \ @@ -365,7 +354,13 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \ $(LOCAL_PATH)/configs/wifi/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf \ $(LOCAL_PATH)/configs/wifi/WCNSS_qcom_cfg.ini:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/WCNSS_qcom_cfg.ini \ - frameworks/native/data/etc/android.hardware.wifi.aware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.aware.xml + +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/android.hardware.wifi.aware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.aware.xml \ + frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml \ + frameworks/native/data/etc/android.hardware.wifi.passpoint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.passpoint.xml \ + frameworks/native/data/etc/android.hardware.wifi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.xml \ + frameworks/native/data/etc/android.software.ipsec_tunnels.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.ipsec_tunnels.xml PRODUCT_SYSTEM_EXT_PROPERTIES += \ config.disable_rtt=true