diff --git a/device.mk.save b/device.mk.save
new file mode 100644
index 0000000..77d86d4
--- /dev/null
+++ b/device.mk.save
@@ -0,0 +1,503 @@
+#
+# Copyright (C) 2018 The LineageOS Project
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+# A/B
+AB_OTA_POSTINSTALL_CONFIG += \
+ RUN_POSTINSTALL_system=true \
+ POSTINSTALL_PATH_system=system/bin/otapreopt_script \
+ FILESYSTEM_TYPE_system=ext4 \
+ POSTINSTALL_OPTIONAL_system=true
+
+AB_OTA_POSTINSTALL_CONFIG += \
+ RUN_POSTINSTALL_vendor=true \
+ POSTINSTALL_PATH_vendor=bin/checkpoint_gc \
+ FILESYSTEM_TYPE_vendor=ext4 \
+ POSTINSTALL_OPTIONAL_vendor=true
+
+PRODUCT_PACKAGES += \
+ checkpoint_gc \
+ otapreopt_script
+
+# ANT+
+PRODUCT_PACKAGES += \
+ AntHalService-Soong \
+ com.dsi.ant@1.0.vendor
+
+# Alert slider
+PRODUCT_PACKAGES += \
+ KeyHandler \
+ tri-state-key-calibrate
+
+# APEX
+$(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)
+
+# Atrace
+PRODUCT_PACKAGES += \
+ android.hardware.atrace@1.0-service
+
+# Audio
+PRODUCT_PACKAGES += \
+ android.hardware.audio@6.0-impl \
+ android.hardware.audio.effect@6.0-impl \
+ android.hardware.audio.service \
+ android.hardware.bluetooth.audio@2.0-impl \
+ android.hardware.soundtrigger@2.3-impl \
+ audio.bluetooth.default \
+ audio.r_submix.default \
+ audio.usb.default \
+ liba2dpoffload \
+ libbatterylistener \
+ libcomprcapture \
+ libexthwplugin \
+ libhdmiedid \
+ libhfp \
+ libqcompostprocbundle \
+ libqcomvisualizer \
+ libqcomvoiceprocessing \
+ libsndmonitor \
+ libspkrprot \
+ libvolumelistener
+
+PRODUCT_COPY_FILES += \
+ $(LOCAL_PATH)/audio/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \
+ $(LOCAL_PATH)/audio/audio_platform_info.xml:$(TARGET_COPY_OUT_ODM)/etc/audio_platform_info.xml \
+ $(LOCAL_PATH)/audio/audio_io_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_io_policy.conf \
+ $(LOCAL_PATH)/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
+ $(LOCAL_PATH)/audio/audio_policy_configuration_a2dp_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_a2dp_offload_disabled.xml \
+ $(LOCAL_PATH)/audio/bluetooth_hearing_aid_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_hearing_aid_audio_policy_configuration.xml \
+ $(LOCAL_PATH)/audio/mixer_paths.xml:$(TARGET_COPY_OUT_ODM)/etc/mixer_paths.xml \
+ $(LOCAL_PATH)/audio/sound_trigger_mixer_paths.xml:$(TARGET_COPY_OUT_ODM)/etc/sound_trigger_mixer_paths.xml \
+ $(LOCAL_PATH)/audio/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_ODM)/etc/sound_trigger_platform_info.xml
+
+PRODUCT_COPY_FILES += \
+ 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/a2dp_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \
+ frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
+ frameworks/av/services/audiopolicy/config/bluetooth_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration.xml \
+ frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
+ frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \
+ frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.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 \
+ frameworks/native/data/etc/android.software.midi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.midi.xml
+
+# Authsecret
+PRODUCT_PACKAGES += \
+ android.hardware.authsecret@1.0.vendor
+
+# Boot animation
+TARGET_SCREEN_HEIGHT := 2400
+TARGET_SCREEN_WIDTH := 1080
+
+# Bluetooth
+PRODUCT_PACKAGES += \
+ android.hardware.bluetooth@1.0.vendor \
+ vendor.qti.hardware.bluetooth_audio@2.1.vendor \
+ vendor.qti.hardware.btconfigstore@1.0.vendor \
+ vendor.qti.hardware.btconfigstore@2.0.vendor
+
+PRODUCT_COPY_FILES += \
+ frameworks/native/data/etc/android.hardware.bluetooth.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth.xml \
+ frameworks/native/data/etc/android.hardware.bluetooth_le.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth_le.xml
+
+# Blur
+TARGET_ENABLE_BLUR := true
+
+# Boot control
+PRODUCT_PACKAGES += \
+ android.hardware.boot@1.1-impl-qti \
+ android.hardware.boot@1.1-impl-qti.recovery \
+ android.hardware.boot@1.1-service
+
+# Camera
+PRODUCT_PACKAGES += \
+ android.hardware.camera.provider@2.4-impl \
+ android.hardware.camera.provider@2.4-service_64 \
+ libcamera_metadata_shim \
+ vendor.qti.hardware.camera.postproc@1.0.vendor
+
+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
+# # Call recording for Google Dialer
+PRODUCT_COPY_FILES += \
+ $(LOCAL_PATH)/configs/com.google.android.apps.dialer.call_recording_audio.features.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/com.google.android.apps.dialer.call_recording_audio.features.xml
+
+# Configstore
+PRODUCT_PACKAGES += \
+ disable_configstore
+
+# Dalvik
+$(call inherit-product, frameworks/native/build/phone-xhdpi-6144-dalvik-heap.mk)
+
+# 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 += \
+ android.hardware.graphics.mapper@3.0-impl-qti-display \
+ android.hardware.graphics.mapper@4.0-impl-qti-display \
+ android.hardware.memtrack@1.0-impl \
+ android.hardware.memtrack@1.0-service \
+ gralloc.lito \
+ libdisplayconfig.qti \
+ libdisplayconfig.system.qti \
+ libqdMetaData \
+ libqdMetaData.system \
+ libsdmcore \
+ libsdmutils \
+ libtinyxml \
+ libvulkan \
+ memtrack.lito \
+ vendor.display.config@1.9.vendor \
+ vendor.display.config@2.0 \
+ vendor.display.config@2.0.vendor \
+ vendor.qti.hardware.display.allocator-service \
+ vendor.qti.hardware.display.composer-service \
+ vendor.qti.hardware.display.mapper@1.1.vendor \
+ vendor.qti.hardware.display.mapper@2.0.vendor \
+ vendor.qti.hardware.display.mapper@3.0.vendor \
+ vendor.qti.hardware.display.mapper@4.0.vendor
+
+PRODUCT_COPY_FILES += \
+ frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml
+
+# DRM
+PRODUCT_PACKAGES += \
+ android.hardware.drm@1.3.vendor \
+ android.hardware.drm-service.clearkey
+
+# fastbootd
+PRODUCT_PACKAGES += \
+ android.hardware.fastboot@1.1-impl.custom \
+ fastbootd
+
+# Fingerprint
+PRODUCT_PACKAGES += \
+ android.hardware.biometrics.fingerprint@2.3-service.oplus \
+ libshims_fingerprint.oplus
+
+PRODUCT_COPY_FILES += \
+ frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml
+
+# 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
+
+# Gatekeeper
+PRODUCT_PACKAGES += \
+ android.hardware.gatekeeper@1.0.vendor
+
+# GPS
+PRODUCT_PACKAGES += \
+ android.hardware.gnss.measurement_corrections@1.1.vendor \
+ android.hardware.gnss.visibility_control@1.0.vendor \
+ android.hardware.gnss@2.1.vendor
+
+PRODUCT_COPY_FILES += \
+ $(LOCAL_PATH)/configs/gps.conf:$(TARGET_COPY_OUT_ODM)/etc/gps.conf
+
+PRODUCT_COPY_FILES += \
+ frameworks/native/data/etc/android.hardware.location.gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.location.gps.xml
+
+# Graphics
+PRODUCT_COPY_FILES += \
+ frameworks/native/data/etc/android.hardware.opengles.aep.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.opengles.aep.xml \
+ frameworks/native/data/etc/android.hardware.vulkan.compute-0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.compute-0.xml \
+ frameworks/native/data/etc/android.hardware.vulkan.level-1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.level-1.xml \
+ frameworks/native/data/etc/android.hardware.vulkan.version-1_1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.version-1_1.xml \
+ frameworks/native/data/etc/android.software.opengles.deqp.level-2020-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.opengles.deqp.level.xml \
+ frameworks/native/data/etc/android.software.vulkan.deqp.level-2020-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml
+
+# Health
+PRODUCT_PACKAGES += \
+ android.hardware.health@2.1-impl \
+ android.hardware.health@2.1-service
+
+# HIDL
+PRODUCT_PACKAGES += \
+ libhidltransport.vendor \
+ libhwbinder.vendor
+
+# Hotword enrollment
+PRODUCT_COPY_FILES += \
+ $(LOCAL_PATH)/configs/privapp-permissions-hotword.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/privapp-permissions-hotword.xml
+
+# IPACM
+PRODUCT_PACKAGES += \
+ ipacm \
+ IPACM_cfg.xml
+
+# Init
+PRODUCT_PACKAGES += \
+ fstab.qcom \
+ fstab.qcom.ramdisk \
+ init.class_main.sh \
+ init.oplus.hw.rc \
+ init.oplus.hw.rc.recovery \
+ init.oplus.rc \
+ init.qcom.early_boot.sh \
+ init.qcom.post_boot.sh \
+ init.qcom.rc \
+ init.qcom.recovery.rc \
+ init.qcom.sh \
+ init.qcom.usb.rc \
+ init.qcom.usb.sh \
+ init.target.rc \
+ ueventd.oplus.rc \
+ ueventd.qcom.rc
+
+# Keymaster
+PRODUCT_PACKAGES += \
+ android.hardware.keymaster@4.1.vendor
+
+# LiveDisplay
+PRODUCT_PACKAGES += \
+ vendor.lineage.livedisplay@2.1-service.oplus
+
+# Media
+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_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_c2.xml \
+ frameworks/av/media/libstagefright/data/media_codecs_google_c2_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_c2_audio.xml \
+ frameworks/av/media/libstagefright/data/media_codecs_google_c2_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_c2_video.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
+
+PRODUCT_PACKAGES += \
+ libavservices_minijail \
+ libavservices_minijail.vendor
+
+# Net
+PRODUCT_PACKAGES += \
+ android.system.net.netd@1.1.vendor
+
+# Neural networks
+PRODUCT_PACKAGES += \
+ android.hardware.neuralnetworks@1.3.vendor
+
+# NFC
+PRODUCT_PACKAGES += \
+ android.hardware.nfc@1.2-service \
+ com.android.nfc_extras \
+ NfcNci \
+ Tag
+
+PRODUCT_COPY_FILES += \
+ frameworks/native/data/etc/android.hardware.nfc.ese.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.ese.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.uicc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.uicc.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.se.omapi.ese.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.se.omapi.ese.xml \
+ frameworks/native/data/etc/android.hardware.se.omapi.uicc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.se.omapi.uicc.xml \
+ frameworks/native/data/etc/com.android.nfc_extras.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.android.nfc_extras.xml
+
+# OMX
+PRODUCT_PACKAGES += \
+ init.qti.media.sh \
+ libOmxAacEnc \
+ libOmxAmrEnc \
+ libOmxCore \
+ libOmxEvrcEnc \
+ libOmxG711Enc \
+ libOmxQcelp13Enc \
+ libOmxVdec \
+ libOmxVenc \
+ libstagefrighthw
+
+# Overlays
+$(call inherit-product, hardware/oplus/overlay/qssi/qssi.mk)
+
+DEVICE_PACKAGE_OVERLAYS += \
+ $(LOCAL_PATH)/overlay-lineage
+
+PRODUCT_ENFORCE_RRO_TARGETS := *
+PRODUCT_PACKAGES += \
+ CarrierConfigResCommon \
+ FrameworksResTarget \
+ OPlusFrameworksResCommon \
+ OPlusFrameworksResTarget \
+ OPlusSettingsProviderResTarget \
+ OPlusSettingsResCommon \
+ OPlusSystemUIResCommon \
+ OPlusSystemUIResTarget \
+ WifiResTarget
+
+# Override OTA assert
+TARGET_OTA_ASSERT_DEVICE := avicii,OnePlusNord,Nord
+
+# Partitions
+PRODUCT_USE_DYNAMIC_PARTITIONS := true
+
+# Power
+PRODUCT_PACKAGES += \
+ android.hardware.power-service-qti \
+ android.hardware.power@1.2.vendor \
+ vendor.qti.hardware.perf@2.2.vendor
+
+# QMI
+PRODUCT_PACKAGES += \
+ libjson \
+ libqti_vndfwk_detect.vendor \
+ libvndfwk_detect_jni.qti.vendor
+
+# RIL
+PRODUCT_PACKAGES += \
+ android.hardware.radio@1.5.vendor \
+ android.hardware.radio.config@1.2.vendor \
+ android.hardware.radio.deprecated@1.0.vendor \
+ android.hardware.secure_element@1.2.vendor \
+ libprotobuf-cpp-full \
+ librmnetctl
+
+# Seccomp policy
+PRODUCT_COPY_FILES += \
+ $(LOCAL_PATH)/seccomp/mediacodec.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediacodec.policy
+# Call recording for Google Dialer
+PRODUCT_COPY_FILES += \
+ $(LOCAL_PATH)/configs/com.google.android.apps.dialer.call_recording_audio.features.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/com.google.android.apps.dialer.call_recording_audio.features.xml
+
+# Sensors
+PRODUCT_PACKAGES += \
+ android.hardware.sensors@2.0-service.multihal \
+ libsensorndkbridge \
+ sensors.oplus
+
+PRODUCT_COPY_FILES += \
+ $(LOCAL_PATH)/configs/hals.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/hals.conf
+
+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.barometer.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_11/android.hardware.sensor.barometer.xml \
+ frameworks/native/data/etc/android.hardware.sensor.barometer.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_9/android.hardware.sensor.barometer.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
+
+# Shipping API
+PRODUCT_SHIPPING_API_LEVEL := 29
+
+# Soong namespaces
+PRODUCT_SOONG_NAMESPACES += \
+ $(LOCAL_PATH) \
+ hardware/oplus
+
+# Quick Tap
+TARGET_SUPPORTS_QUICK_TAP := true
+
+# Telephony
+PRODUCT_PACKAGES += \
+ extphonelib \
+ extphonelib-product \
+ extphonelib.xml \
+ extphonelib_product.xml \
+ ims-ext-common \
+ ims_ext_common.xml \
+ qti-telephony-hidl-wrapper \
+ qti-telephony-hidl-wrapper-prd \
+ qti_telephony_hidl_wrapper.xml \
+ qti_telephony_hidl_wrapper_prd.xml \
+ qti-telephony-utils \
+ qti-telephony-utils-prd \
+ qti_telephony_utils.xml \
+ qti_telephony_utils_prd.xml \
+ telephony-ext
+
+PRODUCT_BOOT_JARS += \
+ telephony-ext
+
+PRODUCT_COPY_FILES += \
+ frameworks/native/data/etc/android.hardware.telephony.cdma.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.telephony.cdma.xml \
+ frameworks/native/data/etc/android.hardware.telephony.gsm.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.telephony.gsm.xml \
+ frameworks/native/data/etc/android.hardware.telephony.ims.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.telephony.ims.xml \
+ frameworks/native/data/etc/android.software.sip.voip.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.sip.voip.xml
+
+# Thermal
+PRODUCT_COPY_FILES += \
+ $(LOCAL_PATH)/configs/thermal-engine.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-engine.conf
+
+# Touch
+PRODUCT_PACKAGES += \
+ vendor.lineage.touch@1.0-service.oplus
+
+# Update engine
+PRODUCT_PACKAGES += \
+ update_engine \
+ update_engine_sideload \
+ update_verifier
+
+PRODUCT_PACKAGES_DEBUG += \
+ update_engine_client
+
+# USB
+PRODUCT_PACKAGES += \
+ android.hardware.usb@1.3-service-qti
+
+PRODUCT_SOONG_NAMESPACES += \
+ vendor/qcom/opensource/usb/etc
+
+PRODUCT_COPY_FILES += \
+ frameworks/native/data/etc/android.hardware.usb.accessory.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.usb.accessory.xml \
+ frameworks/native/data/etc/android.hardware.usb.host.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.usb.host.xml
+
+TARGET_HAS_UDFPS := true
+
+# Vendor service manager
+PRODUCT_PACKAGES += \
+ vndservicemanager
+
+# 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.oplus
+
+PRODUCT_COPY_FILES += \
+ vendor/qcom/opensource/vibrator/excluded-input-devices.xml:$(TARGET_COPY_OUT_VENDOR)/etc/excluded-input-devices.xml
+
+# VNDK
+PRODUCT_USE_PRODUCT_VNDK_OVERRIDE := true
+
+# WiFi
+PRODUCT_PACKAGES += \
+ android.hardware.wifi@1.0-service \
+ hostapd \
+ libwpa_client \
+ libwifi-hal-ctrl \
+ libwifi-hal-qcom \
+ vendor.qti.hardware.wifi.hostapd@1.2.vendor \
+ vendor.qti.hardware.wifi.supplicant@2.1.vendor \
+ wpa_supplicant \
+ wpa_supplicant.conf
+
+PRODUCT_COPY_FILES += \
+ 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
+
+# WiFi Display
+PRODUCT_PACKAGES += \
+ libnl \
+ libwfdaac_vendor
+
+PRODUCT_BOOT_JARS += \
+ WfdCommon
+
+# Inherit from the proprietary files makefile.
+$(call inherit-product, vendor/oneplus/avicii/avicii-vendor.mk)
diff --git a/overlay/OPlusFrameworksResTarget/res/xml/power_profile.xml b/overlay/OPlusFrameworksResTarget/res/xml/power_profile.xml
index 290e3df..033236a 100644
--- a/overlay/OPlusFrameworksResTarget/res/xml/power_profile.xml
+++ b/overlay/OPlusFrameworksResTarget/res/xml/power_profile.xml
@@ -40,7 +40,7 @@
significantly, so should be measured on the shipping platform
with a power meter. -->
- 0
- - 29.53
+ - 29.53
- 80.09
- 241
- 80