diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 4f30561..d3ceffd 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -15,8 +15,7 @@ # PRODUCT_MAKEFILES := \ - $(LOCAL_DIR)/omni_ginkgo.mk + $(LOCAL_DIR)/twrp_ginkgo.mk COMMON_LUNCH_CHOICES := \ - omni_ginkgo-userdebug \ - omni_ginkgo-eng + twrp_ginkgo-eng diff --git a/BoardConfig.mk b/BoardConfig.mk index e44b85e..520610d 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -14,7 +14,8 @@ # limitations under the License. # -DEVICE_PATH := device/xiaomi/ginkgo +# Default device path +DEVICE_PATH := device/$(PRODUCT_BRAND)/$(TARGET_DEVICE) # For building with minimal manifest ALLOW_MISSING_DEPENDENCIES := true @@ -37,15 +38,15 @@ ENABLE_CPUSETS := true ENABLE_SCHEDBOOST := true # Bootloader -TARGET_BOOTLOADER_BOARD_NAME := trinket +TARGET_BOOTLOADER_BOARD_NAME := $(PRODUCT_PLATFORM) TARGET_NO_BOOTLOADER := true # Platform -TARGET_BOARD_PLATFORM := trinket +TARGET_BOARD_PLATFORM := $(TARGET_BOOTLOADER_BOARD_NAME) TARGET_BOARD_PLATFORM_GPU := qcom-adreno640 # Kernel -BOARD_KERNEL_CMDLINE := console=ttyMSM0,115200n8 earlycon=msm_geni_serial,0xa90000 androidboot.hardware=qcom androidboot.console=ttyMSM0 androidboot.memcg=1 lpm_levels.sleep_disabled=1 video=vfb:640x400,bpp=32,memsize=3072000 msm_rtb.filter=0x237 service_locator.enable=1 swiotlb=2048 firmware_class.path=/vendor/firmware_mnt/image loop.max_part=7 androidboot.usbcontroller=a600000.dwc3 androidboot.selinux=permissive +BOARD_KERNEL_CMDLINE := console=ttyMSM0,115200n8 androidboot.hardware=qcom androidboot.console=ttyMSM0 androidboot.memcg=1 lpm_levels.sleep_disabled=1 video=vfb:640x400,bpp=32,memsize=3072000 msm_rtb.filter=0x237 service_locator.enable=1 swiotlb=1 earlycon=msm_geni_serial,0x4a90000 loop.max_part=7 cgroup.memory=nokmem,nosocket androidboot.selinux=permissive androidboot.usbconfigfs=true BOARD_KERNEL_BASE := 0x00000000 BOARD_KERNEL_PAGESIZE := 4096 BOARD_KERNEL_TAGS_OFFSET := 0x00000100 @@ -68,7 +69,11 @@ TARGET_OTA_ASSERT_DEVICE := ginkgo # Avb BOARD_AVB_ENABLE := true -BOARD_AVB_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP) +BOARD_AVB_RECOVERY_KEY_PATH := external/avb/test/data/testkey_rsa4096.pem +BOARD_AVB_RECOVERY_ALGORITHM := SHA256_RSA4096 +BOARD_AVB_RECOVERY_ROLLBACK_INDEX := 1 +BOARD_AVB_RECOVERY_ROLLBACK_INDEX_LOCATION := 1 +BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --flag 2 # Partitions BOARD_FLASH_BLOCK_SIZE := 262144 @@ -83,9 +88,7 @@ BOARD_VENDORIMAGE_PARTITION_SIZE := 1610612736 BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 # System as root -#BOARD_BUILD_SYSTEM_ROOT_IMAGE := true -BOARD_ROOT_EXTRA_FOLDERS := bluetooth dsp firmware persist -BOARD_SUPPRESS_SECURE_ERASE := true +BOARD_BUILD_SYSTEM_ROOT_IMAGE := true # File systems TARGET_USERIMAGES_USE_EXT4 := true @@ -95,68 +98,59 @@ TARGET_USERIMAGES_USE_F2FS := true BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 TARGET_COPY_OUT_VENDOR := vendor +# Encryption +BOARD_USES_METADATA_PARTITION := true +BOARD_USES_QCOM_FBE_DECRYPTION := true +TW_INCLUDE_CRYPTO := true +TW_INCLUDE_FBE_METADATA_DECRYPT := true +TW_USE_FSCRYPT_POLICY := 1 +PLATFORM_SECURITY_PATCH := 2127-12-31 +VENDOR_SECURITY_PATCH := $(PLATFORM_SECURITY_PATCH) + +# Extras +BOARD_SUPPRESS_SECURE_ERASE := true +TARGET_SYSTEM_PROP += $(DEVICE_PATH)/system.prop + # Recovery BOARD_HAS_LARGE_FILESYSTEM := true -TARGET_RECOVERY_PIXEL_FORMAT := "BGRA_8888" +TARGET_RECOVERY_DEVICE_MODULES += \ + libandroidicu \ + libcap \ + libion \ + libxml2 -# Crypto -TW_INCLUDE_CRYPTO := true -BOARD_USES_QCOM_FBE_DECRYPTION := true -TW_INCLUDE_FBE_METADATA_DECRYPT := true +TW_RECOVERY_ADDITIONAL_RELINK_LIBRARY_FILES += \ + $(TARGET_OUT_SHARED_LIBRARIES)/libcap.so \ + $(TARGET_OUT_SHARED_LIBRARIES)/libion.so \ + $(TARGET_OUT_SHARED_LIBRARIES)/libxml2.so + +#TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/recovery/root/system/etc/recovery.fstab # TWRP specific build flags -TW_THEME := portrait_hdpi RECOVERY_SDCARD_ON_DATA := true TARGET_RECOVERY_QCOM_RTC_FIX := true +TARGET_RECOVERY_PIXEL_FORMAT := BGRA_8888 +TW_THEME := portrait_hdpi TW_EXCLUDE_DEFAULT_USB_INIT := true TW_EXTRA_LANGUAGES := true TW_INCLUDE_NTFS_3G := true -TW_FORCE_USE_BUSYBOX := true -TW_INPUT_BLACKLIST := "hbtp_vm" -#TARGET_USE_CUSTOM_LUN_FILE_PATH := "/config/usb_gadget/g1/functions/mass_storage.0/lun.%d/file" -TW_BRIGHTNESS_PATH := "/sys/class/backlight/panel0-backlight/brightness" +TW_INPUT_BLACKLIST := hbtp_vm +TARGET_USE_CUSTOM_LUN_FILE_PATH := /config/usb_gadget/g1/functions/mass_storage.0/lun.%d/file +TW_BRIGHTNESS_PATH := /sys/class/backlight/panel0-backlight/brightness TW_MAX_BRIGHTNESS := 2047 TW_DEFAULT_BRIGHTNESS := 1200 TW_Y_OFFSET := 80 TW_H_OFFSET := -80 -#TW_SCREEN_BLANK_ON_BOOT := true -TWRP_INCLUDE_LOGCAT := true -TARGET_USES_LOGD := true TARGET_USES_MKE2FS := true -TW_EXCLUDE_TWRPAPP := true TW_HAS_EDL_MODE := true TW_NO_SCREEN_TIMEOUT := true TW_INCLUDE_RESETPROP := true +TW_INCLUDE_REPACKTOOLS := true TW_OVERRIDE_SYSTEM_PROPS := \ - "ro.build.product;ro.build.fingerprint=ro.system.build.fingerprint;ro.build.version.incremental;ro.product.device=ro.product.system.device;ro.product.model=ro.product.system.model;ro.product.name=ro.product.system.name" - -TARGET_RECOVERY_DEVICE_MODULES += \ - android.hidl.base@1.0 \ - ashmemd \ - ashmemd_aidl_interface-cpp \ - libashmemd_client \ - libcap \ - libicui18n \ - libion \ - libicuuc \ - libpcrecpp \ - libxml2 - -TW_RECOVERY_ADDITIONAL_RELINK_BINARY_FILES += \ - $(TARGET_OUT_EXECUTABLES)/ashmemd + "ro.build.product;ro.build.fingerprint=ro.system.build.fingerprint;ro.build.version.incremental;ro.product.device=ro.product.system.device;ro.product.model=ro.product.system.model;ro.product.name=ro.product.system.name" -TW_RECOVERY_ADDITIONAL_RELINK_LIBRARY_FILES += \ - $(TARGET_OUT_SHARED_LIBRARIES)/android.hidl.base@1.0.so \ - $(TARGET_OUT_SHARED_LIBRARIES)/ashmemd_aidl_interface-cpp.so \ - $(TARGET_OUT_SHARED_LIBRARIES)/libashmemd_client.so \ - $(TARGET_OUT_SHARED_LIBRARIES)/libcap.so \ - $(TARGET_OUT_SHARED_LIBRARIES)/libicui18n.so \ - $(TARGET_OUT_SHARED_LIBRARIES)/libicuuc.so \ - $(TARGET_OUT_SHARED_LIBRARIES)/libion.so \ - $(TARGET_OUT_SHARED_LIBRARIES)/libpcrecpp.so \ - $(TARGET_OUT_SHARED_LIBRARIES)/libxml2.so - -# Hack: prevent anti rollback -PLATFORM_SECURITY_PATCH := 2099-12-31 -PLATFORM_VERSION := 16.1.0 -VENDOR_SECURITY_PATCH := 2099-12-31 +# TWRP Debug Flags +TWRP_INCLUDE_LOGCAT := true +TARGET_USES_LOGD := true +TARGET_RECOVERY_DEVICE_MODULES += debuggerd +TW_RECOVERY_ADDITIONAL_RELINK_FILES += $(TARGET_OUT_EXECUTABLES)/debuggerd diff --git a/device.mk b/device.mk new file mode 100644 index 0000000..fd19a46 --- /dev/null +++ b/device.mk @@ -0,0 +1,24 @@ +# Api +PRODUCT_SHIPPING_API_LEVEL := 28 + +# Dependencies +PRODUCT_COPY_FILES += \ + $(OUT_DIR)/target/product/$(PRODUCT_RELEASE_NAME)/obj/SHARED_LIBRARIES/libandroidicu_intermediates/libandroidicu.so:$(TARGET_COPY_OUT_RECOVERY)/root/system/lib64/libandroidicu.so + +# Health HAL +PRODUCT_PACKAGES += \ + android.hardware.health@2.1-impl.recovery + +# HIDL +PRODUCT_PACKAGES += \ + libhidltransport \ + libhwbinder + +# qcom decryption +PRODUCT_PACKAGES_ENG += \ + qcom_decrypt \ + qcom_decrypt_fbe + +# Soong namespaces +PRODUCT_SOONG_NAMESPACES += \ + $(LOCAL_PATH) diff --git a/omni_ginkgo.mk b/omni_ginkgo.mk deleted file mode 100644 index 025975c..0000000 --- a/omni_ginkgo.mk +++ /dev/null @@ -1,41 +0,0 @@ -# -# Copyright (C) 2019 The TwrpBuilder Open-Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# Release name -PRODUCT_RELEASE_NAME := ginkgo - -$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk) - -# Inherit from our custom product configuration -$(call inherit-product, vendor/omni/config/common.mk) -$(call inherit-product, vendor/omni/config/gsm.mk) - -PRODUCT_PACKAGES += \ - qcom_decrypt \ - qcom_decrypt_fbe - -## Device identifier. This must come after all inclusions -PRODUCT_DEVICE := ginkgo -PRODUCT_NAME := omni_ginkgo -PRODUCT_BRAND := Xiaomi -PRODUCT_MODEL := Xiaomi Redmi Note 8 -PRODUCT_MANUFACTURER := Xiaomi - -PRODUCT_SYSTEM_PROPERTY_BLACKLIST += \ - ro.bootimage.build.date.utc \ - ro.build.date.utc diff --git a/prebuilt/Image.gz b/prebuilt/Image.gz index a89f6b8..e239b82 100644 Binary files a/prebuilt/Image.gz and b/prebuilt/Image.gz differ diff --git a/prebuilt/dtb.img b/prebuilt/dtb.img index ea17c02..d2f082d 100644 Binary files a/prebuilt/dtb.img and b/prebuilt/dtb.img differ diff --git a/prebuilt/dtbo.img b/prebuilt/dtbo.img index 2595386..65b7586 100644 Binary files a/prebuilt/dtbo.img and b/prebuilt/dtbo.img differ diff --git a/recovery/root/init.recovery.qcom.rc b/recovery/root/init.recovery.qcom.rc index bbef6c5..6d616d3 100644 --- a/recovery/root/init.recovery.qcom.rc +++ b/recovery/root/init.recovery.qcom.rc @@ -27,18 +27,14 @@ import /init.recovery.qcom_decrypt.rc +on init + setprop prepdecrypt.setpatch true + setprop prepdecrypt.loglevel 2 + on fs wait /dev/block/platform/soc/${ro.boot.bootdevice} symlink /dev/block/platform/soc/${ro.boot.bootdevice} /dev/block/bootdevice - setprop prepdecrypt.setpatch true - -service unified-script /system/bin/unified-script.sh - user root - group root - disabled - oneshot - seclabel u:r:recovery:s0 + export ANDROID_ROOT /system_root - on boot - chmod 0777 /system/bin/unified-script.sh - start unified-script +on boot + start health-hal-2-1 diff --git a/recovery/root/mnt/vendor/persist b/recovery/root/mnt/vendor/persist deleted file mode 100644 index a944f0d..0000000 --- a/recovery/root/mnt/vendor/persist +++ /dev/null @@ -1 +0,0 @@ -/persist \ No newline at end of file diff --git a/recovery/root/system/bin/android.hardware.gatekeeper@1.0-service-qti b/recovery/root/system/bin/android.hardware.gatekeeper@1.0-service-qti index 500b5be..64838cb 100644 Binary files a/recovery/root/system/bin/android.hardware.gatekeeper@1.0-service-qti and b/recovery/root/system/bin/android.hardware.gatekeeper@1.0-service-qti differ diff --git a/recovery/root/system/bin/android.hardware.keymaster@4.0-service-qti b/recovery/root/system/bin/android.hardware.keymaster@4.0-service-qti index 38fb66a..5192234 100644 Binary files a/recovery/root/system/bin/android.hardware.keymaster@4.0-service-qti and b/recovery/root/system/bin/android.hardware.keymaster@4.0-service-qti differ diff --git a/recovery/root/system/bin/qseecomd b/recovery/root/system/bin/qseecomd index 0d33cdd..6d5317b 100644 Binary files a/recovery/root/system/bin/qseecomd and b/recovery/root/system/bin/qseecomd differ diff --git a/recovery/root/system/bin/unified-script.sh b/recovery/root/system/bin/unified-script.sh deleted file mode 100644 index c16beb4..0000000 --- a/recovery/root/system/bin/unified-script.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/system/bin/sh -# This script is needed to automatically set device props. - - -load_willow() -{ - resetprop "ro.product.model" "Redmi Note 8T" - resetprop "ro.product.name" "willow" - resetprop "ro.build.product" "willow" - resetprop "ro.product.device" "willow" - resetprop "ro.vendor.product.device" "willow" -} - -load_ginkgo() -{ - resetprop "ro.product.model" "Redmi Note 8" - resetprop "ro.product.name" "ginkgo" - resetprop "ro.build.product" "ginkgo" - resetprop "ro.product.device" "ginkgo" - resetprop "ro.vendor.product.device" "ginkgo" -} - -region=$(getprop ro.boot.hwc) -echo $region -hwversion=$(getprop ro.boot.hwversion) -echo $hwversion - -case $region in - "Global_B") - case $hwversion in - "18.31.0"|"18.39.0"|"19.39.0") - load_willow - ;; - *) - load_ginkgo - ;; - esac - ;; - *) - load_ginkgo - ;; -esac - -exit 0 diff --git a/recovery/root/system/etc/init/android.hardware.health@2.1-service.rc b/recovery/root/system/etc/init/android.hardware.health@2.1-service.rc new file mode 100644 index 0000000..b6d9e3b --- /dev/null +++ b/recovery/root/system/etc/init/android.hardware.health@2.1-service.rc @@ -0,0 +1,6 @@ +service health-hal-2-1 /vendor/bin/hw/android.hardware.health@2.1-service + class hal charger + user system + group system + capabilities WAKE_ALARM + file /dev/kmsg w diff --git a/recovery/root/system/etc/init/ashmemd.rc b/recovery/root/system/etc/init/ashmemd.rc deleted file mode 100644 index ee16d95..0000000 --- a/recovery/root/system/etc/init/ashmemd.rc +++ /dev/null @@ -1,4 +0,0 @@ -service ashmemd /system/bin/ashmemd - class core - user nobody - group nobody diff --git a/recovery/root/system/etc/recovery.fstab b/recovery/root/system/etc/recovery.fstab index 5858256..eaff5ae 100644 --- a/recovery/root/system/etc/recovery.fstab +++ b/recovery/root/system/etc/recovery.fstab @@ -36,7 +36,7 @@ /dev/block/bootdevice/by-name/system / ext4 ro,barrier=1,discard wait,avb /dev/block/bootdevice/by-name/cache /cache ext4 nosuid,noatime,nodev,barrier=1 wait /dev/block/bootdevice/by-name/metadata /metadata ext4 noatime,nosuid,nodev,discard wait,formattable,first_stage_mount -/dev/block/bootdevice/by-name/userdata /data f2fs noatime,nosuid,nodev,nodiscard,alloc_mode=reuse,fsync_mode=nobarrier latemount,wait,check,fileencryption=ice,reservedsize=128M,quota +/dev/block/bootdevice/by-name/userdata /data f2fs noatime,nosuid,nodev,nodiscard,alloc_mode=reuse,fsync_mode=nobarrier,inlinecrypt latemount,wait,check,fileencryption=ice,reservedsize=128M,quota /devices/platform/soc/4784000.sdhci/mmc_host* /storage/sdcard1 vfat nosuid,nodev wait,voldmanaged=sdcard1:auto,encryptable=footer /devices/platform/soc/1da4000.ufshc_card/host* /storage/sdcard1 vfat nosuid,nodev wait,voldmanaged=sdcard1:auto,encryptable=footer /dev/block/bootdevice/by-name/modem /vendor/firmware_mnt vfat ro,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait diff --git a/recovery/root/system/etc/task_profiles.json b/recovery/root/system/etc/task_profiles.json index 822758e..77a8099 100644 --- a/recovery/root/system/etc/task_profiles.json +++ b/recovery/root/system/etc/task_profiles.json @@ -49,12 +49,17 @@ { "Name": "UClampMin", "Controller": "cpu", - "File": "cpu.util.min" + "File": "cpu.uclamp.min" }, { "Name": "UClampMax", "Controller": "cpu", - "File": "cpu.util.max" + "File": "cpu.uclamp.max" + }, + { + "Name": "FreezerState", + "Controller": "freezer", + "File": "frozen/freezer.state" } ], @@ -72,6 +77,32 @@ } ] }, + { + "Name": "Frozen", + "Actions": [ + { + "Name": "JoinCgroup", + "Params": + { + "Controller": "freezer", + "Path": "frozen" + } + } + ] + }, + { + "Name": "Unfrozen", + "Actions": [ + { + "Name": "JoinCgroup", + "Params": + { + "Controller": "freezer", + "Path": "" + } + } + ] + }, { "Name": "NormalPerformance", "Actions": [ @@ -124,6 +155,19 @@ } ] }, + { + "Name": "CameraServicePerformance", + "Actions": [ + { + "Name": "JoinCgroup", + "Params": + { + "Controller": "schedtune", + "Path": "camera-daemon" + } + } + ] + }, { "Name": "AudioAppPerformance", "Actions" : [ @@ -551,6 +595,79 @@ } } ] + }, + { + "Name": "FreezerThawed", + "Actions": [ + { + "Name": "SetAttribute", + "Params": + { + "Name": "FreezerState", + "Value": "THAWED" + } + } + ] + }, + { + "Name": "FreezerFrozen", + "Actions": [ + { + "Name": "SetAttribute", + "Params": + { + "Name": "FreezerState", + "Value": "FROZEN" + } + } + ] + } + ], + + "AggregateProfiles": [ + { + "Name": "SCHED_SP_DEFAULT", + "Profiles": [ "TimerSlackNormal" ] + }, + { + "Name": "SCHED_SP_BACKGROUND", + "Profiles": [ "HighEnergySaving", "LowIoPriority", "TimerSlackHigh" ] + }, + { + "Name": "SCHED_SP_FOREGROUND", + "Profiles": [ "HighPerformance", "HighIoPriority", "TimerSlackNormal" ] + }, + { + "Name": "SCHED_SP_TOP_APP", + "Profiles": [ "MaxPerformance", "MaxIoPriority", "TimerSlackNormal" ] + }, + { + "Name": "SCHED_SP_RT_APP", + "Profiles": [ "RealtimePerformance", "MaxIoPriority", "TimerSlackNormal" ] + }, + { + "Name": "CPUSET_SP_DEFAULT", + "Profiles": [ "TimerSlackNormal" ] + }, + { + "Name": "CPUSET_SP_BACKGROUND", + "Profiles": [ "HighEnergySaving", "ProcessCapacityLow", "LowIoPriority", "TimerSlackHigh" ] + }, + { + "Name": "CPUSET_SP_FOREGROUND", + "Profiles": [ "HighPerformance", "ProcessCapacityHigh", "HighIoPriority", "TimerSlackNormal" ] + }, + { + "Name": "CPUSET_SP_TOP_APP", + "Profiles": [ "MaxPerformance", "ProcessCapacityMax", "MaxIoPriority", "TimerSlackNormal" ] + }, + { + "Name": "CPUSET_SP_SYSTEM", + "Profiles": [ "ServiceCapacityLow", "TimerSlackNormal" ] + }, + { + "Name": "CPUSET_SP_RESTRICTED", + "Profiles": [ "ServiceCapacityRestricted", "TimerSlackNormal" ] } ] } diff --git a/recovery/root/system/etc/twrp.fstab b/recovery/root/system/etc/twrp.fstab index 383f556..1449007 100644 --- a/recovery/root/system/etc/twrp.fstab +++ b/recovery/root/system/etc/twrp.fstab @@ -7,7 +7,7 @@ /dtbo emmc /dev/block/bootdevice/by-name/dtbo flags=backup=1;display="Dtbo";flashimg=1 /cache ext4 /dev/block/bootdevice/by-name/cache /recovery emmc /dev/block/bootdevice/by-name/recovery flags=backup=1 -/system ext4 /dev/block/bootdevice/by-name/system flags=display="System";backup=0;wipeingui +/system_root ext4 /dev/block/bootdevice/by-name/system flags=display="System";backup=0;wipeingui /vendor ext4 /dev/block/bootdevice/by-name/vendor flags=display="Vendor";backup=0;wipeingui /system_image emmc /dev/block/bootdevice/by-name/system diff --git a/recovery/root/system/etc/vintf/manifest.xml b/recovery/root/system/etc/vintf/manifest.xml index b3953a4..a6ceff9 100644 --- a/recovery/root/system/etc/vintf/manifest.xml +++ b/recovery/root/system/etc/vintf/manifest.xml @@ -3,7 +3,7 @@ manifest.xml framework_manifest.xml --> - + android.frameworks.displayservice hwbinder @@ -86,7 +86,6 @@ netutils-wrapper - 1.0 @@ -99,11 +98,9 @@ @1.0::IAtCmdFwd/AtCmdFwdService - - 29 - 28 29 + 30 diff --git a/recovery/root/system/lib64/libandroidicu.so b/recovery/root/system/lib64/libandroidicu.so deleted file mode 100644 index 9ff6041..0000000 Binary files a/recovery/root/system/lib64/libandroidicu.so and /dev/null differ diff --git a/recovery/root/ueventd.qcom.rc b/recovery/root/ueventd.qcom.rc index b3c77af..90ef749 100644 --- a/recovery/root/ueventd.qcom.rc +++ b/recovery/root/ueventd.qcom.rc @@ -1,4 +1,4 @@ -# Copyright (c) 2012-2015, 2017-2019, The Linux Foundation. All rights reserved. +# Copyright (c) 2012-2015, 2017-2020, The Linux Foundation. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: @@ -32,6 +32,7 @@ firmware_directories /vendor/firmware_mnt/image/ # the DIAG device node is not world writable/readable. /dev/diag 0660 system oem_2901 +/dev/mhi_*_pipe_4 0660 system system /dev/genlock 0666 system system /dev/wlan 0660 wifi wifi @@ -40,6 +41,7 @@ firmware_directories /vendor/firmware_mnt/image/ /dev/kgsl-2d0 0666 root root /dev/kgsl-2d1 0666 root root /dev/ion 0664 system system +/dev/membuf 0664 system system /dev/rtc0 0660 system system /dev/smd0 0660 system system /dev/smd4 0660 system system @@ -55,8 +57,12 @@ firmware_directories /vendor/firmware_mnt/image/ /dev/dpl_ctrl 0660 usb usb /dev/ipa_odl_ctl 0660 radio radio /dev/ipa_adpl 0660 system oem_2905 -/dev/hab 0666 system system /dev/synx_device 0660 root camera +/dev/hab 0666 system system +/dev/iio:device* 0664 system system + +#permissions for UFS RPMB BSG device node +/dev/0:0:0:49476 0600 system system #permissions for CSVT /dev/smd11 0660 radio radio @@ -124,22 +130,27 @@ firmware_directories /vendor/firmware_mnt/image/ /dev/at_usb0 0640 radio radio /dev/at_mdm0 0640 radio radio /dev/video* 0660 system camera +/dev/cvp* 0660 system camera /dev/media* 0660 system camera /dev/v4l-subdev* 0660 system camera /dev/qseecom 0660 system drmrpc /dev/qce 0660 system drmrpc -/dev/smcinvoke 0660 system system +/dev/smcinvoke 0660 system drmrpc /dev/qsee_ipc_irq_spss 0660 system drmrpc /dev/seemplog 0660 system system /dev/pft 0660 system drmrpc /dev/spcom 0660 system system +/dev/spss_utils 0660 system system /dev/sp_kernel 0660 system system +/dev/sp_nvm 0660 system system /dev/sp_ssr 0660 system system /dev/sp_keymaster 0660 system system +/dev/sp_keymaster_ssr 0660 system system /dev/sec_nvm_* 0660 system system /dev/cryptoapp 0660 system system /dev/spdaemon_ssr 0660 system system -/dev/cam-hyp-intf* 0660 system camera +/dev/spu_hal_ssr 0660 system system +/dev/iuicc* 0660 system system /dev/gemini0 0660 system camera /dev/jpeg0 0660 system camera /dev/jpeg1 0660 system camera @@ -149,32 +160,30 @@ firmware_directories /vendor/firmware_mnt/image/ /dev/adsprpc-smd-secure 0644 system system /dev/system_health_monitor 0644 radio system /dev/mdss_rotator 0664 system system -/dev/cpu_dma_latency 0660 root system #QDSS /dev/byte-cntr 0660 system oem_2902 /dev/mhi_qdss 0660 system oem_2902 /sys/class/qdss_bridge/mhi_qdss mode 0660 system oem_2902 -#leds -/sys/class/leds/red delay_on 0640 system system -/sys/class/leds/red delay_off 0640 system system -/sys/class/leds/red breath 0640 system system -/sys/class/leds/green delay_on 0640 system system -/sys/class/leds/green delay_off 0640 system system -/sys/class/leds/green breath 0640 system system -/sys/class/leds/blue delay_on 0640 system system -/sys/class/leds/blue delay_off 0640 system system -/sys/class/leds/blue breath 0640 system system +#qg +/dev/qg 0660 system system +/dev/qg_battery 0660 system system + +#qvr +/dev/qvr_external_sensor_ioctl 0660 system system +/sys/kernel/qvr_external_sensor/fd 0660 system system # wlan /dev/wcnss_wlan 0660 system system /dev/wcnss_ctrl 0660 system system /sys/devices/soc/a000000.qcom,wcnss-wlan/net/wlan0/queues/rx-* rps_cpus 0660 system system /sys/devices/soc/a000000.qcom,wcnss-wlan/net/p2p0/queues/rx-* rps_cpus 0660 system system +/sys/devices/platform/soc/18800000.qcom,icnss/net/wlan*/queues/rx-* rps_cpus 0660 system system +/sys/devices/platform/soc/1c00000.qcom,pcie/pci0000:00/0000:00:00.0/0000:01:00.0/net/wlan*/queues/rx-* rps_cpus 0660 system system /dev/spidev0.0 0660 system audio -/dev/i2c-7 0660 system audio /dev/spidev0.1 0660 system system +/dev/i2c-7 0660 system audio /dev/msm_camera/* 0660 system camera /dev/gemini/ 0660 system camera /dev/mercury0 0660 system camera @@ -274,24 +283,8 @@ firmware_directories /vendor/firmware_mnt/image/ /sys/devices/platform/soc/a84000.i2c/i2c-2/2-0020/input/input* secure_touch_enable 0660 system drmrpc /sys/devices/platform/soc/soc:fpc1020* fingerdown_wait 0220 system system -# native sensors input -/sys/devices/virtual/input/input* enable_int 0660 system input -/sys/devices/virtual/input/input* gyro_op_mode 0660 system input -/sys/devices/virtual/input/input* acc_range 0660 system input -/sys/devices/virtual/input/input* acc_value 0660 system input -/sys/devices/virtual/input/input* gyro_odr 0660 system input -/sys/devices/virtual/input/input* fifo_data_sel 0660 system input -/sys/devices/virtual/input/input* fifo_watermark 0660 system input -/sys/devices/virtual/input/input* enable 0660 system input -/sys/devices/virtual/input/input* acc_odr 0660 system input -/sys/devices/virtual/input/input* temperature 0660 system input -/sys/devices/virtual/input/input* acc_op_mode 0660 system input -/sys/devices/virtual/input/input* fifo_bytecount 0660 system input -/sys/devices/virtual/input/input* gyro_range 0660 system input -/sys/devices/virtual/input/input* gyro_value 0660 system input - -# GNSS PPS Device premissions -/dev/pps* 0660 gps gps +# GNSS Device premissions +/dev/gnss_sirf 0660 gps gps # laser sensor access /sys/devices/virtual/input/input* enable_ps_sensor 0660 system input @@ -302,6 +295,17 @@ firmware_directories /vendor/firmware_mnt/image/ /dev/vm_bms 0660 system system /dev/battery_data 0660 system system +#leds +/sys/class/leds/red delay_on 0640 system system +/sys/class/leds/red delay_off 0640 system system +/sys/class/leds/red breath 0640 system system +/sys/class/leds/green delay_on 0640 system system +/sys/class/leds/green delay_off 0640 system system +/sys/class/leds/green breath 0640 system system +/sys/class/leds/blue delay_on 0640 system system +/sys/class/leds/blue delay_off 0640 system system +/sys/class/leds/blue breath 0640 system system + # wlan /dev/wcnss_wlan 0660 system system /dev/wcnss_ctrl 0660 system system @@ -336,7 +340,9 @@ firmware_directories /vendor/firmware_mnt/image/ /dev/ramdump* 0640 system system # Fingerprint device -/dev/qbt1000 0660 system system +/dev/qbt* 0660 system system +/sys/class/fts/touch_aoi aoi_set 0660 root system +/sys/class/fts/touch_aoi power_set 0660 root system #ImproveTouch device /dev/hbtp_input 0660 system system @@ -363,12 +369,15 @@ firmware_directories /vendor/firmware_mnt/image/ /sys/class/leds/red delay_on 0640 system system /sys/class/leds/red delay_off 0640 system system /sys/class/leds/red breath 0640 system system +/sys/class/leds/red trigger 0640 system system /sys/class/leds/green delay_on 0640 system system /sys/class/leds/green delay_off 0640 system system /sys/class/leds/green breath 0640 system system +/sys/class/leds/green trigger 0640 system system /sys/class/leds/blue delay_on 0640 system system /sys/class/leds/blue delay_off 0640 system system /sys/class/leds/blue breath 0640 system system +/sys/class/leds/blue trigger 0640 system system # NPU device /dev/msm_npu 0644 system system @@ -381,6 +390,8 @@ firmware_directories /vendor/firmware_mnt/image/ #Memory Offline /sys/devices/system/memory/memory* state 0660 system system +/sys/devices/virtual/hdcp/msm_hdcp min_level_change 0664 system graphics + # sys-fs display /sys/class/graphics/fb* hpd 0664 system graphics /sys/class/graphics/fb* res_info 0664 system graphics @@ -410,10 +421,65 @@ firmware_directories /vendor/firmware_mnt/image/ /sys/class/graphics/fb0 modes 0664 system graphics /sys/class/graphics/fb0 mode 0664 system graphics /sys/class/graphics/fb0 msm_cmd_autorefresh_en 0664 system graphics -/sys/class/graphics/fb0 dynamic_bitclk 0664 system graphics - -/sys/devices/virtual/hdcp/msm_hdcp min_level_change 0664 system graphics - -#QG device -/dev/qg 0660 system system -/dev/qg_battery 0660 system system +*/ + +#asm330 sensor +#common sensors files +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* buffer/enable 0664 system system +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* buffer/length 0664 system system +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* buffer/watermark 0664 system system +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* discharded_samples 0664 system system +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* current_timestamp_clock 0664 system system +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* hwfifo_flush 0664 system system +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* hwfifo_watermark 0664 system system +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* hwfifo_watermark_max 0664 system system +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* mount_matrix 0664 system system +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* name 0664 system system +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* sampling_frequency 0664 system system +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* sampling_frequency_available 0664 system system +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* scan_elements/in_timestamp_en 0664 system system +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* scan_elements/in_timestamp_index 0664 system system +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* scan_elements/in_timestamp_type 0664 system system + +# standard iio accel attributes +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* in_accel_scale_available 0664 system system +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* in_accel_x_raw 0664 system system +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* in_accel_x_scale 0664 system system +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* in_accel_y_raw 0664 system system +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* in_accel_y_scale 0664 system system +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* in_accel_z_raw 0664 system system +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* in_accel_z_scale 0664 system system +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* scan_elements/in_accel_x_en 0664 system system +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* scan_elements/in_accel_x_index 0664 system system +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* scan_elements/in_accel_x_type 0664 system system +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* scan_elements/in_accel_y_en 0664 system system +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* scan_elements/in_accel_y_index 0664 system system +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* scan_elements/in_accel_y_type 0664 system system +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* scan_elements/in_accel_z_en 0664 system system +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* scan_elements/in_accel_z_index 0664 system system +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* scan_elements/in_accel_z_type 0664 system system + +# standard iio gyro attributes +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* in_anglvel_scale_available 0664 system system +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* in_anglvel_x_raw 0664 system system +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* in_anglvel_x_scale 0664 system system +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* in_anglvel_y_raw 0664 system system +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* in_anglvel_y_scale 0664 system system +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* in_anglvel_z_raw 0664 system system +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* in_anglvel_z_scale 0664 system system +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* scan_elements/in_anglvel_x_en 0664 system system +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* scan_elements/in_anglvel_x_index 0664 system system +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* scan_elements/in_anglvel_x_type 0664 system system +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* scan_elements/in_anglvel_y_en 0664 system system +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* scan_elements/in_anglvel_y_index 0664 system system +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* scan_elements/in_anglvel_y_type 0664 system system +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* scan_elements/in_anglvel_z_en 0664 system system +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* scan_elements/in_anglvel_z_index 0664 system system +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* scan_elements/in_anglvel_z_type 0664 system system + + +# standard iio temp attributes +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* in_temp_offset 0664 system system +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* in_temp_raw 0664 system system +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* in_temp_scale 0664 system system +/sys/devices/platform/soc/*.i2c/i2c-*/*-*/iio:device* in_temp_scale_available 0664 system system diff --git a/recovery/root/vendor/etc/gpfspath_oem_config.xml b/recovery/root/vendor/etc/gpfspath_oem_config.xml new file mode 100644 index 0000000..6b2e82a --- /dev/null +++ b/recovery/root/vendor/etc/gpfspath_oem_config.xml @@ -0,0 +1,61 @@ + + + + + + + /data/vendor/tzstorage/ + /mnt/vendor/persist/data/ + 4 + /data/system/users/ + /data/misc/qsee/ + /qwes + /qwes/licenses + diff --git a/recovery/root/vendor/etc/vintf/compatibility_matrix.xml b/recovery/root/vendor/etc/vintf/compatibility_matrix.xml deleted file mode 100644 index 9b640db..0000000 --- a/recovery/root/vendor/etc/vintf/compatibility_matrix.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - - android.frameworks.schedulerservice - 1.0 - - ISchedulingPolicyService - default - - - - android.frameworks.sensorservice - 1.0 - - ISensorManager - default - - - - android.hidl.allocator - 1.0 - - IAllocator - ashmem - - - - android.hidl.manager - 1.0 - - IServiceManager - default - - - - android.hidl.memory - 1.0 - - IMapper - ashmem - - - - android.hidl.token - 1.0 - - ITokenManager - default - - - - android.system.wifi.keystore - 1.0 - - IKeystore - default - - - - vendor.qti.hardware.sigma_miracast - 1.0 - - Isigma_miracast - sigmahal - - - - vendor.qti.hardware.wifi.keystore - 1.0 - - IKeystoreExt - default - - - - 29 - - - 28 - - diff --git a/recovery/root/vendor/etc/vintf/manifest.xml b/recovery/root/vendor/etc/vintf/manifest.xml index beccad3..bc04553 100644 --- a/recovery/root/vendor/etc/vintf/manifest.xml +++ b/recovery/root/vendor/etc/vintf/manifest.xml @@ -1,39 +1,27 @@ - + android.hardware.audio hwbinder - 5.0 + 6.0 IDevicesFactory default - @5.0::IDevicesFactory/default + @6.0::IDevicesFactory/default android.hardware.audio.effect hwbinder - 5.0 + 6.0 IEffectsFactory default - @5.0::IEffectsFactory/default - - - android.hardware.biometrics.fingerprint - hwbinder - 2.1 - - IBiometricsFingerprint - default - - @2.1::IBiometricsFingerprint/default + @6.0::IEffectsFactory/default android.hardware.bluetooth @@ -78,23 +66,8 @@ android.hardware.drm hwbinder - 1.0 - - ICryptoFactory - default - - - IDrmFactory - default - - @1.0::ICryptoFactory/default - @1.0::IDrmFactory/default - @1.1::ICryptoFactory/wfdhdcp - @1.1::IDrmFactory/wfdhdcp - @1.2::ICryptoFactory/clearkey - @1.2::ICryptoFactory/widevine - @1.2::IDrmFactory/clearkey - @1.2::IDrmFactory/widevine + @1.3::ICryptoFactory/wfdhdcp + @1.3::IDrmFactory/wfdhdcp android.hardware.gatekeeper @@ -106,57 +79,6 @@ @1.0::IGatekeeper/default - - android.hardware.gnss - hwbinder - 1.1 - - IGnss - default - - @1.0::IGnss/gnss_vendor - @1.1::IGnss/default - - - android.hardware.graphics.allocator - hwbinder - 2.0 - - IAllocator - default - - @2.0::IAllocator/default - - - android.hardware.graphics.composer - hwbinder - 2.3 - - IComposer - default - - @2.3::IComposer/default - - - android.hardware.graphics.mapper - passthrough - 2.1 - - IMapper - default - - @2.1::IMapper/default - - - android.hardware.health - hwbinder - 2.0 - - IHealth - default - - @2.0::IHealth/default - android.hardware.ir hwbinder @@ -177,16 +99,6 @@ @4.0::IKeymasterDevice/default - - android.hardware.light - hwbinder - 2.0 - - ILight - default - - @2.0::ILight/default - android.hardware.media.omx hwbinder @@ -212,30 +124,6 @@ @1.0::IMemtrack/default - - android.hardware.neuralnetworks - hwbinder - 1.2 - - IDevice - qti-default - qti-dsp - qti-gpu - - @1.2::IDevice/qti-default - @1.2::IDevice/qti-dsp - @1.2::IDevice/qti-gpu - - - android.hardware.power - hwbinder - 1.0 - - IPower - default - - @1.0::IPower/default - android.hardware.radio hwbinder @@ -264,16 +152,6 @@ @1.0::IDevice/default - - android.hardware.sensors - hwbinder - 1.0 - - ISensors - default - - @1.0::ISensors/default - android.hardware.soundtrigger hwbinder @@ -304,66 +182,6 @@ @1.0::IOffloadControl/default - - android.hardware.thermal - hwbinder - 1.0 - - IThermal - default - - @1.0::IThermal/default - - - android.hardware.usb - hwbinder - 1.0 - - IUsb - default - - @1.0::IUsb/default - - - android.hardware.vibrator - hwbinder - 1.0 - - IVibrator - default - - @1.0::IVibrator/default - - - android.hardware.wifi - hwbinder - 1.3 - - IWifi - default - - @1.3::IWifi/default - - - android.hardware.wifi.hostapd - hwbinder - 1.1 - - IHostapd - default - - @1.1::IHostapd/default - - - android.hardware.wifi.supplicant - hwbinder - 1.2 - - ISupplicant - default - - @1.2::ISupplicant/default - com.fingerprints.extension hwbinder @@ -384,26 +202,6 @@ @2.0::IFingerprintNavigation/default @2.0::IFingerprintSensorTest/default - - com.qualcomm.qti.ant - hwbinder - 1.0 - - IAntHci - default - - @1.0::IAntHci/default - - - com.qualcomm.qti.bluetooth_audio - hwbinder - 1.0 - - IBluetoothAudio - default - - @1.0::IBluetoothAudio/default - com.qualcomm.qti.dpm.api hwbinder @@ -427,12 +225,12 @@ com.qualcomm.qti.uceservice hwbinder - 2.1 + 2.2 IUceService com.qualcomm.qti.uceservice - @2.1::IUceService/com.qualcomm.qti.uceservice + @2.2::IUceService/com.qualcomm.qti.uceservice vendor.display.color @@ -444,16 +242,6 @@ @1.3::IDisplayColor/default - - vendor.display.config - hwbinder - 1.11 - - IDisplayConfig - default - - @1.11::IDisplayConfig/default - vendor.display.postproc hwbinder @@ -492,42 +280,12 @@ vendor.qti.esepowermanager hwbinder - 1.0 + 1.1 IEsePowerManager default - @1.0::IEsePowerManager/default - - - vendor.qti.gnss - hwbinder - 1.2 - - ILocHidlGnss - gnss_vendor - - @1.2::ILocHidlGnss/gnss_vendor - - - vendor.qti.gnss - hwbinder - 2.1 - - ILocHidlGnss - gnss_vendor - - @2.1::ILocHidlGnss/gnss_vendor - - - vendor.qti.gnss - hwbinder - 3.0 - - ILocHidlGnss - gnss_vendor - - @3.0::ILocHidlGnss/gnss_vendor + @1.1::IEsePowerManager/default vendor.qti.hardware.alarm @@ -552,22 +310,22 @@ vendor.qti.hardware.bluetooth_sar hwbinder - 1.0 + 1.1 IBluetoothSar default - @1.0::IBluetoothSar/default + @1.1::IBluetoothSar/default vendor.qti.hardware.btconfigstore hwbinder - 1.0 + 2.0 IBTConfigStore default - @1.0::IBTConfigStore/default + @2.0::IBTConfigStore/default vendor.qti.hardware.cacert @@ -622,24 +380,24 @@ @1.0::ILinkLatency/default - vendor.qti.hardware.display.allocator + vendor.qti.hardware.dsp hwbinder 1.0 - IQtiAllocator - default + IDspService + dspservice - @1.0::IQtiAllocator/default + @1.0::IDspService/dspservice - vendor.qti.hardware.display.mapper - passthrough - 2.0 + vendor.qti.hardware.embmssl + hwbinder + 1.0 - IQtiMapper - default + IEmbms + embmsslServer0 - @2.0::IQtiMapper/default + @1.0::IEmbms/embmsslServer0 vendor.qti.hardware.factory @@ -661,6 +419,16 @@ @1.0::IFmHci/default + + vendor.qti.hardware.fstman + hwbinder + 1.0 + + IFstManager + default + + @1.0::IFstManager/default + vendor.qti.hardware.iop hwbinder @@ -674,22 +442,22 @@ vendor.qti.hardware.perf hwbinder - 2.0 + 2.2 IPerf default - @2.0::IPerf/default + @2.2::IPerf/default - vendor.qti.hardware.qdutils_disp + vendor.qti.hardware.qccvndhal hwbinder 1.0 - IQdutilsDisp - default + IQccvndhal + qccvndhal - @1.0::IQdutilsDisp/default + @1.0::IQccvndhal/qccvndhal vendor.qti.hardware.qseecom @@ -731,14 +499,14 @@ vendor.qti.hardware.radio.ims hwbinder - 1.5 + 1.6 IImsRadio imsradio0 imsradio1 - @1.5::IImsRadio/imsradio0 - @1.5::IImsRadio/imsradio1 + @1.6::IImsRadio/imsradio0 + @1.6::IImsRadio/imsradio1 vendor.qti.hardware.radio.lpa @@ -824,31 +592,6 @@ @1.0::IUimRemoteServiceServer/uimRemoteServer0 @1.0::IUimRemoteServiceServer/uimRemoteServer1 - - vendor.qti.hardware.scve.objecttracker - hwbinder - 1.0 - - IObjectTracker - objectTracker - - @1.0::IObjectTracker/objectTracker - - - vendor.qti.hardware.scve.panorama - hwbinder - 1.0 - - IPanoramaStitching - panoStitching - - - IPanoramaTracking - panoTracking - - @1.0::IPanoramaStitching/panoStitching - @1.0::IPanoramaTracking/panoTracking - vendor.qti.hardware.sensorscalibrate hwbinder @@ -859,16 +602,6 @@ @1.0::ISensorsCalibrate/default - - vendor.qti.hardware.servicetracker - hwbinder - 1.1 - - IServicetracker - default - - @1.1::IServicetracker/default - vendor.qti.hardware.soter hwbinder @@ -889,26 +622,6 @@ @1.0::ITuiComm/default - - vendor.qti.hardware.wifi.hostapd - hwbinder - 1.1 - - IHostapdVendor - default - - @1.1::IHostapdVendor/default - - - vendor.qti.hardware.wifi.supplicant - hwbinder - 2.0 - - ISupplicantVendor - default - - @2.0::ISupplicantVendor/default - vendor.qti.hardware.wifi.wifilearner hwbinder @@ -974,15 +687,25 @@ @1.0::IService/default + + vendor.qti.ims.factory + hwbinder + 1.0 + + IImsFactory + default + + @1.0::IImsFactory/default + vendor.qti.imsrtpservice hwbinder - 2.1 + 3.0 IRTPService imsrtpservice - @2.1::IRTPService/imsrtpservice + @3.0::IRTPService/imsrtpservice vendor.qti.power.pasrmanager @@ -1004,87 +727,7 @@ @1.0::IDisplayFeature/default - - vendor.xiaomi.hardware.mfidoca - hwbinder - 1.0 - - IFidoService - default - - @1.0::IFidoService/default - - - vendor.xiaomi.hardware.misys - hwbinder - 1.0 - - IMiSys - default - - @1.0::IMiSys/default - - - vendor.xiaomi.hardware.misys - hwbinder - 2.0 - - IMiSys - default - - @2.0::IMiSys/default - - - vendor.xiaomi.hardware.misys - hwbinder - 3.0 - - IMiSys - default - - @3.0::IMiSys/default - - - vendor.xiaomi.hardware.mlipay - hwbinder - 1.1 - - IMlipayService - default - - @1.1::IMlipayService/default - - - vendor.xiaomi.hardware.mtdservice - hwbinder - 1.2 - - IMTService - default - - @1.2::IMTService/default - - - vendor.xiaomi.hardware.tidaservice - hwbinder - 1.2 - - ITidaService - default - - @1.2::ITidaService/default - - - vendor.xiaomi.hardware.vsimapp - hwbinder - 1.0 - - IVSIMService - default - - @1.0::IVSIMService/default - - 29.0 + 30.0 diff --git a/recovery/root/vendor/etc/vintf/manifest/android.hardware.health@2.1.xml b/recovery/root/vendor/etc/vintf/manifest/android.hardware.health@2.1.xml new file mode 100644 index 0000000..34fdca6 --- /dev/null +++ b/recovery/root/vendor/etc/vintf/manifest/android.hardware.health@2.1.xml @@ -0,0 +1,7 @@ + + + android.hardware.health + hwbinder + @2.1::IHealth/default + + diff --git a/recovery/root/vendor/lib64/android.hardware.confirmationui@1.0.so b/recovery/root/vendor/lib64/android.hardware.confirmationui@1.0.so deleted file mode 100644 index 13b6cea..0000000 Binary files a/recovery/root/vendor/lib64/android.hardware.confirmationui@1.0.so and /dev/null differ diff --git a/recovery/root/vendor/lib64/android.hardware.gatekeeper@1.0.so b/recovery/root/vendor/lib64/android.hardware.gatekeeper@1.0.so deleted file mode 100644 index a52d805..0000000 Binary files a/recovery/root/vendor/lib64/android.hardware.gatekeeper@1.0.so and /dev/null differ diff --git a/recovery/root/vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so b/recovery/root/vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so index 40311a7..ef98c4a 100644 Binary files a/recovery/root/vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so and b/recovery/root/vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so differ diff --git a/recovery/root/vendor/lib64/libGPreqcancel.so b/recovery/root/vendor/lib64/libGPreqcancel.so index 1b73b5a..4f1c8a9 100644 Binary files a/recovery/root/vendor/lib64/libGPreqcancel.so and b/recovery/root/vendor/lib64/libGPreqcancel.so differ diff --git a/recovery/root/vendor/lib64/libGPreqcancel_svc.so b/recovery/root/vendor/lib64/libGPreqcancel_svc.so index 1cec699..b1c0e59 100644 Binary files a/recovery/root/vendor/lib64/libGPreqcancel_svc.so and b/recovery/root/vendor/lib64/libGPreqcancel_svc.so differ diff --git a/recovery/root/vendor/lib64/libQSEEComAPI.so b/recovery/root/vendor/lib64/libQSEEComAPI.so index e881050..195a9fc 100644 Binary files a/recovery/root/vendor/lib64/libQSEEComAPI.so and b/recovery/root/vendor/lib64/libQSEEComAPI.so differ diff --git a/recovery/root/vendor/lib64/libSecureUILib.so b/recovery/root/vendor/lib64/libSecureUILib.so index 27cc814..edd29dd 100644 Binary files a/recovery/root/vendor/lib64/libSecureUILib.so and b/recovery/root/vendor/lib64/libSecureUILib.so differ diff --git a/recovery/root/vendor/lib64/libStDrvInt.so b/recovery/root/vendor/lib64/libStDrvInt.so index 333c204..eb19039 100644 Binary files a/recovery/root/vendor/lib64/libStDrvInt.so and b/recovery/root/vendor/lib64/libStDrvInt.so differ diff --git a/recovery/root/vendor/lib64/libdiag.so b/recovery/root/vendor/lib64/libdiag.so index c1fbc39..d674d6a 100644 Binary files a/recovery/root/vendor/lib64/libdiag.so and b/recovery/root/vendor/lib64/libdiag.so differ diff --git a/recovery/root/vendor/lib64/libdisplayconfig.qti.so b/recovery/root/vendor/lib64/libdisplayconfig.qti.so new file mode 100644 index 0000000..2d33f52 Binary files /dev/null and b/recovery/root/vendor/lib64/libdisplayconfig.qti.so differ diff --git a/recovery/root/vendor/lib64/libdrm.so b/recovery/root/vendor/lib64/libdrm.so new file mode 100644 index 0000000..590e5b7 Binary files /dev/null and b/recovery/root/vendor/lib64/libdrm.so differ diff --git a/recovery/root/vendor/lib64/libdrmfs.so b/recovery/root/vendor/lib64/libdrmfs.so index 78a9339..ea23ba9 100644 Binary files a/recovery/root/vendor/lib64/libdrmfs.so and b/recovery/root/vendor/lib64/libdrmfs.so differ diff --git a/recovery/root/vendor/lib64/libdrmtime.so b/recovery/root/vendor/lib64/libdrmtime.so index 4a265cf..b8b82e6 100644 Binary files a/recovery/root/vendor/lib64/libdrmtime.so and b/recovery/root/vendor/lib64/libdrmtime.so differ diff --git a/recovery/root/vendor/lib64/libdrmutils.so b/recovery/root/vendor/lib64/libdrmutils.so new file mode 100644 index 0000000..4c3aa2e Binary files /dev/null and b/recovery/root/vendor/lib64/libdrmutils.so differ diff --git a/recovery/root/vendor/lib64/libdsutils.so b/recovery/root/vendor/lib64/libdsutils.so new file mode 100644 index 0000000..7b08f34 Binary files /dev/null and b/recovery/root/vendor/lib64/libdsutils.so differ diff --git a/recovery/root/vendor/lib64/libidl.so b/recovery/root/vendor/lib64/libidl.so new file mode 100644 index 0000000..fe06fab Binary files /dev/null and b/recovery/root/vendor/lib64/libidl.so differ diff --git a/recovery/root/vendor/lib64/libkeymasterdeviceutils.so b/recovery/root/vendor/lib64/libkeymasterdeviceutils.so index e89c2f6..3c38299 100644 Binary files a/recovery/root/vendor/lib64/libkeymasterdeviceutils.so and b/recovery/root/vendor/lib64/libkeymasterdeviceutils.so differ diff --git a/recovery/root/vendor/lib64/libkeymasterprovision.so b/recovery/root/vendor/lib64/libkeymasterprovision.so index 264f090..f2156ef 100644 Binary files a/recovery/root/vendor/lib64/libkeymasterprovision.so and b/recovery/root/vendor/lib64/libkeymasterprovision.so differ diff --git a/recovery/root/vendor/lib64/libkeymasterutils.so b/recovery/root/vendor/lib64/libkeymasterutils.so index fb84095..3b05110 100644 Binary files a/recovery/root/vendor/lib64/libkeymasterutils.so and b/recovery/root/vendor/lib64/libkeymasterutils.so differ diff --git a/recovery/root/vendor/lib64/libkeystore-engine-wifi-hidl.so b/recovery/root/vendor/lib64/libkeystore-engine-wifi-hidl.so index 471a556..cec2ce4 100644 Binary files a/recovery/root/vendor/lib64/libkeystore-engine-wifi-hidl.so and b/recovery/root/vendor/lib64/libkeystore-engine-wifi-hidl.so differ diff --git a/recovery/root/vendor/lib64/libkeystore-wifi-hidl.so b/recovery/root/vendor/lib64/libkeystore-wifi-hidl.so index fb7b4d3..d356866 100644 Binary files a/recovery/root/vendor/lib64/libkeystore-wifi-hidl.so and b/recovery/root/vendor/lib64/libkeystore-wifi-hidl.so differ diff --git a/recovery/root/vendor/lib64/libmdmdetect.so b/recovery/root/vendor/lib64/libmdmdetect.so new file mode 100644 index 0000000..fb55bec Binary files /dev/null and b/recovery/root/vendor/lib64/libmdmdetect.so differ diff --git a/recovery/root/vendor/lib64/libops.so b/recovery/root/vendor/lib64/libops.so new file mode 100644 index 0000000..927de89 Binary files /dev/null and b/recovery/root/vendor/lib64/libops.so differ diff --git a/recovery/root/vendor/lib64/libqcbor.so b/recovery/root/vendor/lib64/libqcbor.so new file mode 100644 index 0000000..4f236d8 Binary files /dev/null and b/recovery/root/vendor/lib64/libqcbor.so differ diff --git a/recovery/root/vendor/lib64/libqdutils.so b/recovery/root/vendor/lib64/libqdutils.so index 6eea2fc..cadff41 100644 Binary files a/recovery/root/vendor/lib64/libqdutils.so and b/recovery/root/vendor/lib64/libqdutils.so differ diff --git a/recovery/root/vendor/lib64/libqisl.so b/recovery/root/vendor/lib64/libqisl.so index 29a58e8..73fe4f5 100644 Binary files a/recovery/root/vendor/lib64/libqisl.so and b/recovery/root/vendor/lib64/libqisl.so differ diff --git a/recovery/root/vendor/lib64/libqmi_cci.so b/recovery/root/vendor/lib64/libqmi_cci.so new file mode 100644 index 0000000..cb5de09 Binary files /dev/null and b/recovery/root/vendor/lib64/libqmi_cci.so differ diff --git a/recovery/root/vendor/lib64/libqmi_client_qmux.so b/recovery/root/vendor/lib64/libqmi_client_qmux.so new file mode 100644 index 0000000..9351107 Binary files /dev/null and b/recovery/root/vendor/lib64/libqmi_client_qmux.so differ diff --git a/recovery/root/vendor/lib64/libqmi_common_so.so b/recovery/root/vendor/lib64/libqmi_common_so.so new file mode 100644 index 0000000..1c6e71b Binary files /dev/null and b/recovery/root/vendor/lib64/libqmi_common_so.so differ diff --git a/recovery/root/vendor/lib64/libqmi_encdec.so b/recovery/root/vendor/lib64/libqmi_encdec.so new file mode 100644 index 0000000..c4f17e7 Binary files /dev/null and b/recovery/root/vendor/lib64/libqmi_encdec.so differ diff --git a/recovery/root/vendor/lib64/libqmiservices.so b/recovery/root/vendor/lib64/libqmiservices.so new file mode 100644 index 0000000..eb2ad9f Binary files /dev/null and b/recovery/root/vendor/lib64/libqmiservices.so differ diff --git a/recovery/root/vendor/lib64/libqservice.so b/recovery/root/vendor/lib64/libqservice.so index 741543d..ed1ff4a 100644 Binary files a/recovery/root/vendor/lib64/libqservice.so and b/recovery/root/vendor/lib64/libqservice.so differ diff --git a/recovery/root/vendor/lib64/libqtikeymaster4.so b/recovery/root/vendor/lib64/libqtikeymaster4.so index ea8f60c..b9d5576 100644 Binary files a/recovery/root/vendor/lib64/libqtikeymaster4.so and b/recovery/root/vendor/lib64/libqtikeymaster4.so differ diff --git a/recovery/root/vendor/lib64/librecovery_updater_msm.so b/recovery/root/vendor/lib64/librecovery_updater_msm.so new file mode 100644 index 0000000..6c6818b Binary files /dev/null and b/recovery/root/vendor/lib64/librecovery_updater_msm.so differ diff --git a/recovery/root/vendor/lib64/librmp.so b/recovery/root/vendor/lib64/librmp.so new file mode 100644 index 0000000..ec43816 Binary files /dev/null and b/recovery/root/vendor/lib64/librmp.so differ diff --git a/recovery/root/vendor/lib64/librpmb.so b/recovery/root/vendor/lib64/librpmb.so index dd2256b..9358895 100644 Binary files a/recovery/root/vendor/lib64/librpmb.so and b/recovery/root/vendor/lib64/librpmb.so differ diff --git a/recovery/root/vendor/lib64/libsecureui.so b/recovery/root/vendor/lib64/libsecureui.so index 94cfc56..d72ab7d 100644 Binary files a/recovery/root/vendor/lib64/libsecureui.so and b/recovery/root/vendor/lib64/libsecureui.so differ diff --git a/recovery/root/vendor/lib64/libsecureui_svcsock.so b/recovery/root/vendor/lib64/libsecureui_svcsock.so index 7c65dca..31f7747 100644 Binary files a/recovery/root/vendor/lib64/libsecureui_svcsock.so and b/recovery/root/vendor/lib64/libsecureui_svcsock.so differ diff --git a/recovery/root/vendor/lib64/libsoc_helper.so b/recovery/root/vendor/lib64/libsoc_helper.so new file mode 100644 index 0000000..e405f58 Binary files /dev/null and b/recovery/root/vendor/lib64/libsoc_helper.so differ diff --git a/recovery/root/vendor/lib64/libssd.so b/recovery/root/vendor/lib64/libssd.so index 7b6729d..ef59cb5 100644 Binary files a/recovery/root/vendor/lib64/libssd.so and b/recovery/root/vendor/lib64/libssd.so differ diff --git a/recovery/root/vendor/lib64/libtime_genoff.so b/recovery/root/vendor/lib64/libtime_genoff.so index 98088a8..cb64dcd 100644 Binary files a/recovery/root/vendor/lib64/libtime_genoff.so and b/recovery/root/vendor/lib64/libtime_genoff.so differ diff --git a/recovery/root/vendor/lib64/vendor.display.config@1.0.so b/recovery/root/vendor/lib64/vendor.display.config@1.0.so index 428bbdb..e2d911e 100644 Binary files a/recovery/root/vendor/lib64/vendor.display.config@1.0.so and b/recovery/root/vendor/lib64/vendor.display.config@1.0.so differ diff --git a/recovery/root/vendor/lib64/vendor.display.config@2.0.so b/recovery/root/vendor/lib64/vendor.display.config@2.0.so new file mode 100644 index 0000000..fab19ca Binary files /dev/null and b/recovery/root/vendor/lib64/vendor.display.config@2.0.so differ diff --git a/recovery/root/vendor/lib64/vendor.qti.hardware.tui_comm@1.0.so b/recovery/root/vendor/lib64/vendor.qti.hardware.tui_comm@1.0.so index 7b07743..74441ab 100644 Binary files a/recovery/root/vendor/lib64/vendor.qti.hardware.tui_comm@1.0.so and b/recovery/root/vendor/lib64/vendor.qti.hardware.tui_comm@1.0.so differ diff --git a/system.prop b/system.prop index 2fb7db4..b961c09 100644 --- a/system.prop +++ b/system.prop @@ -5,3 +5,5 @@ persist.sys.isUsbOtgEnabled=true vendor.gatekeeper.disable_spu=true ro.boot.avb_version=1.0 ro.boot.vbmeta.avb_version=1.0 +ro.board.platform=trinket +ro.product.board=trinket diff --git a/twrp.dependencies b/twrp.dependencies new file mode 100644 index 0000000..0a2cc6c --- /dev/null +++ b/twrp.dependencies @@ -0,0 +1,10 @@ +[ + { + "repository": "android_device_qcom_common", + "target_path": "device/qcom/common" + }, + { + "repository": "android_device_qcom_twrp-common", + "target_path": "device/qcom/twrp-common" + } +] diff --git a/twrp_ginkgo.mk b/twrp_ginkgo.mk new file mode 100644 index 0000000..74fa69a --- /dev/null +++ b/twrp_ginkgo.mk @@ -0,0 +1,48 @@ +# +# Copyright 2017 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# Only the below variable(s) need to be changed! +# +# Define hardware platform +PRODUCT_PLATFORM := trinket + +# The below variables will be generated automatically +# +# Release name (automatically taken from this file's suffix) +PRODUCT_RELEASE_NAME := $(lastword $(subst /, ,$(lastword $(subst _, ,$(firstword $(subst ., ,$(MAKEFILE_LIST))))))) + +# Custom vendor used in build tree (automatically taken from this file's prefix) +CUSTOM_VENDOR := $(lastword $(subst /, ,$(firstword $(subst _, ,$(firstword $(MAKEFILE_LIST)))))) + +# Inherit from common AOSP config +$(call inherit-product, $(SRC_TARGET_DIR)/product/base.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) + +# Inherit from our custom product configuration +$(call inherit-product, vendor/$(CUSTOM_VENDOR)/config/common.mk) + +# OEM Info (automatically taken from device tree path) +BOARD_VENDOR := $(or $(word 2,$(subst /, ,$(firstword $(MAKEFILE_LIST)))),$(value 2)) + +## Device identifier. This must come after all inclusions +PRODUCT_DEVICE := $(PRODUCT_RELEASE_NAME) +PRODUCT_NAME := $(CUSTOM_VENDOR)_$(PRODUCT_DEVICE) +PRODUCT_BRAND := $(BOARD_VENDOR) +PRODUCT_MODEL := $(shell echo $(PRODUCT_BRAND) | tr '[:lower:]' '[:upper:]')_$(PRODUCT_DEVICE) +PRODUCT_MANUFACTURER := $(PRODUCT_BRAND) + +# Inherit from hardware-specific part of the product configuration +$(call inherit-product, device/$(PRODUCT_BRAND)/$(PRODUCT_DEVICE)/device.mk)