From: wuxianlin Date: Thu, 24 May 2018 12:58:04 +0000 (+0800) Subject: enchilada:I'm OnePlus 6 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=db1518aa045aa0e28eb8818c89d2d917e004f40d;p=GitHub%2Fmoto-9609%2Ftwrp_device_motorola_troika.git enchilada:I'm OnePlus 6 --- diff --git a/AndroidBoard.mk b/AndroidBoard.mk index bdb9a5b..15d5427 100644 --- a/AndroidBoard.mk +++ b/AndroidBoard.mk @@ -25,6 +25,6 @@ LOCAL_PATH := $(call my-dir) -ifneq ($(filter dumpling,$(TARGET_DEVICE)),) +ifneq ($(filter enchilada,$(TARGET_DEVICE)),) include $(call all-makefiles-under,$(LOCAL_PATH)) endif diff --git a/AndroidProducts.mk b/AndroidProducts.mk index cf7e6d3..7d6412b 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -15,4 +15,4 @@ # PRODUCT_MAKEFILES := \ - $(LOCAL_DIR)/omni_dumpling.mk + $(LOCAL_DIR)/omni_enchilada.mk diff --git a/BoardConfig.mk b/BoardConfig.mk index f1ae5d8..3d530f6 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -40,39 +40,33 @@ ENABLE_CPUSETS := true ENABLE_SCHEDBOOST := true # Bootloader -TARGET_BOOTLOADER_BOARD_NAME := msm8998 +TARGET_BOOTLOADER_BOARD_NAME := sdm845 TARGET_NO_BOOTLOADER := true TARGET_USES_UEFI := true -# Crypto -TARGET_HW_DISK_ENCRYPTION := true - # Kernel -BOARD_KERNEL_CMDLINE := androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x237 ehci-hcd.park=3 -BOARD_KERNEL_CMDLINE += lpm_levels.sleep_disabled=1 sched_enable_hmp=1 sched_enable_power_aware=1 -BOARD_KERNEL_CMDLINE += service_locator.enable=1 swiotlb=2048 androidboot.usbcontroller=a800000.dwc3 -BOARD_KERNEL_CMDLINE += androidboot.configfs=true +BOARD_KERNEL_CMDLINE := androidboot.hardware=qcom androidboot.console=ttyMSM0 video=vfb:640x400,bpp=32,memsize=3072000 msm_rtb.filter=0x237 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 service_locator.enable=1 swiotlb=2048 androidboot.configfs=true androidboot.usbcontroller=a600000.dwc3 BOARD_KERNEL_CMDLINE += androidboot.selinux=permissive BOARD_KERNEL_BASE := 0x00000000 BOARD_KERNEL_PAGESIZE := 4096 -BOARD_KERNEL_TAGS_OFFSET := 0x01E00000 -BOARD_RAMDISK_OFFSET := 0x02000000 -TARGET_PREBUILT_KERNEL := device/oneplus/dumpling/prebuilt/Image.gz-dtb +BOARD_HASH_TYPE := sha1 +BOARD_KERNEL_TAGS_OFFSET := 0x00000100 +BOARD_RAMDISK_OFFSET := 0x01000000 +TARGET_PREBUILT_KERNEL := device/oneplus/enchilada/prebuilt/Image.gz-dtb # Platform -TARGET_BOARD_PLATFORM := msm8998 -TARGET_BOARD_PLATFORM_GPU := qcom-adreno540 +TARGET_BOARD_PLATFORM := sdm845 +TARGET_BOARD_PLATFORM_GPU := qcom-adreno630 # Partitions BOARD_FLASH_BLOCK_SIZE := 262144 # (BOARD_KERNEL_PAGESIZE * 64) BOARD_BOOTIMAGE_PARTITION_SIZE := 67108864 -BOARD_CACHEIMAGE_PARTITION_SIZE := 268435456 BOARD_RECOVERYIMAGE_PARTITION_SIZE := 67108864 -BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3221225472 -BOARD_USERDATAIMAGE_PARTITION_SIZE := 56908316672 +BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2998927360 +BOARD_USERDATAIMAGE_PARTITION_SIZE := 54132453376 BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4 - +BOARD_VENDORIMAGE_PARTITION_SIZE := 1073741824 TARGET_USERIMAGES_USE_EXT4 := true TARGET_USERIMAGES_USE_F2FS := true @@ -84,6 +78,10 @@ TARGET_COPY_OUT_VENDOR := vendor BOARD_HAS_LARGE_FILESYSTEM := true BOARD_HAS_NO_SELECT_BUTTON := true TARGET_RECOVERY_PIXEL_FORMAT := "RGBX_8888" +#bootable/recovery/minuitwrp/graphics_drm.cpp +#if defined(RECOVERY_RGBX) +#format = DRM_FORMAT_XBGR8888; +#base_format = GGL_PIXEL_FORMAT_RGBX_8888; # TWRP specific build flags BOARD_HAS_NO_REAL_SDCARD := true @@ -93,8 +91,15 @@ TW_BRIGHTNESS_PATH := "/sys/class/leds/lcd-backlight/brightness" TW_EXCLUDE_DEFAULT_USB_INIT := true TW_EXCLUDE_SUPERSU := true TW_EXTRA_LANGUAGES := true -TW_INCLUDE_CRYPTO := true TW_INCLUDE_NTFS_3G := true +AB_OTA_UPDATER := true TW_INPUT_BLACKLIST := "hbtp_vm" TW_MAX_BRIGHTNESS := 255 TW_THEME := portrait_hdpi +TW_NO_SCREEN_TIMEOUT := true + +# Encryption +PLATFORM_SECURITY_PATCH := 2018-05-01 +TW_INCLUDE_CRYPTO := true +TARGET_HW_DISK_ENCRYPTION := true +TW_INCLUDE_FBE := true diff --git a/README.md b/README.md deleted file mode 100644 index 43f036d..0000000 --- a/README.md +++ /dev/null @@ -1,35 +0,0 @@ -# android_device_oneplus_dumpling -Tree for building TWRP for OnePlus 5T - -## Kernel Sources - -https://github.com/lineageos/android_kernel_oneplus_msm8998/tree/lineage-15.1 - -## To compile - -export ALLOW_MISSING_DEPENDENCIES=true - -. build/envsetup.sh && lunch omni_dumpling-eng - -mka adbd recoveryimage - -## Device specifications - -| Device | OnePlus 5T | -| -----------: | :---------------------------------------------- | -| SoC | Qualcomm MSM8998 Snapdragon 835 | -| CPU | Quad-core 2.45GHz Kryo & quad-core 1.9GHz Kryo | -| GPU | 710MHz Adreno 540 | -| Memory | 6GB / 8GM RAM (LPDDR4X) | -| Shipped Android version | 7.1.1 | -| Storage | 64GB / 128GB (UFS 2.1 2-LANE Flash) | -| Battery | Non-removable Li-Po 3300 mAh | -| Dimensions | 152.7 x 74.1 x 7.25 mm | -| Display | 2160 x 1080 (18:9), 6 inch | -| Rear camera 1 | 16MP (IMX 398), 1.12-micron pixels, f/1.7 Dual LED flash, 4K 30 fps, 1080p 60 fps, 720p 120 fps video | -| Rear camera 2 | 20MP (IMX 376k), 1-micron pixels, f/1.7 | -| Front camera | 16MP (IMX 371), 1-micron pixels, f/2.0 1080p 30 fps video | - -## Device picture - -![OnePlus 5T](https://image01.oneplus.net/shop/201711/16/1850/c2baf281695709898707dd551a05274c_260_0.png "OnePlus 5T in black") diff --git a/omni_dumpling.mk b/omni_dumpling.mk deleted file mode 100644 index e9bc509..0000000 --- a/omni_dumpling.mk +++ /dev/null @@ -1,30 +0,0 @@ -# -# 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. -# - -# Release name -PRODUCT_RELEASE_NAME := dumpling - -$(call inherit-product, build/target/product/embedded.mk) - -# Inherit from our custom product configuration -$(call inherit-product, vendor/omni/config/common.mk) - -## Device identifier. This must come after all inclusions -PRODUCT_DEVICE := dumpling -PRODUCT_NAME := omni_dumpling -PRODUCT_BRAND := OnePlus -PRODUCT_MODEL := OnePlus A5010 -PRODUCT_MANUFACTURER := OnePlus diff --git a/omni_enchilada.mk b/omni_enchilada.mk new file mode 100644 index 0000000..71f3ee1 --- /dev/null +++ b/omni_enchilada.mk @@ -0,0 +1,30 @@ +# +# 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. +# + +# Release name +PRODUCT_RELEASE_NAME := enchilada + +$(call inherit-product, build/target/product/embedded.mk) + +# Inherit from our custom product configuration +$(call inherit-product, vendor/omni/config/common.mk) + +## Device identifier. This must come after all inclusions +PRODUCT_DEVICE := enchilada +PRODUCT_NAME := omni_enchilada +PRODUCT_BRAND := OnePlus +PRODUCT_MODEL := OnePlus A6000 +PRODUCT_MANUFACTURER := OnePlus diff --git a/prebuilt/Image.gz-dtb b/prebuilt/Image.gz-dtb index c10f762..8fde991 100644 Binary files a/prebuilt/Image.gz-dtb and b/prebuilt/Image.gz-dtb differ diff --git a/recovery.fstab b/recovery.fstab index d662a26..676a144 100644 --- a/recovery.fstab +++ b/recovery.fstab @@ -1,15 +1,15 @@ # mount point fstype device device2 flags -/boot emmc /dev/block/bootdevice/by-name/boot -/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 -/system_image emmc /dev/block/bootdevice/by-name/system -/data ext4 /dev/block/bootdevice/by-name/userdata -/firmware vfat /dev/block/bootdevice/by-name/modem flags=display="Firmware";mounttodecrypt;fsflags=ro +/boot emmc /dev/block/bootdevice/by-name/boot flags=slotselect +/system ext4 /dev/block/bootdevice/by-name/system flags=slotselect +/system_image emmc /dev/block/bootdevice/by-name/system flags=slotselect +/vendor ext4 /dev/block/bootdevice/by-name/vendor flags=slotselect;display="Vendor";backup=1 +/vendor_image emmc /dev/block/bootdevice/by-name/vendor flags=slotselect +/data ext4 /dev/block/bootdevice/by-name/userdata flags=encryptable=footer +/firmware vfat /dev/block/bootdevice/by-name/modem flags=slotselect;display="Firmware";mounttodecrypt;fsflags=ro /misc emmc /dev/block/bootdevice/by-name/misc -/modem emmc /dev/block/bootdevice/by-name/modem flags=backup=1;display="Modem" -/bluetooth emmc /dev/block/bootdevice/by-name/bluetooth flags=backup=1;subpartitionof=/modem -/dsp emmc /dev/block/bootdevice/by-name/dsp flags=backup=1;subpartitionof=/modem +/modem emmc /dev/block/bootdevice/by-name/modem flags=slotselect;backup=1;display="Modem" +/bluetooth emmc /dev/block/bootdevice/by-name/bluetooth flags=slotselect;backup=1;subpartitionof=/modem +/dsp emmc /dev/block/bootdevice/by-name/dsp flags=slotselect;backup=1;subpartitionof=/modem /efs1 emmc /dev/block/bootdevice/by-name/modemst1 flags=backup=1;display=EFS /efs2 emmc /dev/block/bootdevice/by-name/modemst2 flags=backup=1;subpartitionof=/efs1 /efsc emmc /dev/block/bootdevice/by-name/fsc flags=backup=1;subpartitionof=/efs1 diff --git a/recovery/root/init.recovery.qcom.rc b/recovery/root/init.recovery.qcom.rc index c5c55c6..9558c90 100644 --- a/recovery/root/init.recovery.qcom.rc +++ b/recovery/root/init.recovery.qcom.rc @@ -25,44 +25,34 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -on early-init - mkdir /firmware 0771 system system - on fs - wait /dev/block/platform/soc/1da4000.ufshc - symlink /dev/block/platform/soc/1da4000.ufshc /dev/block/bootdevice + wait /dev/block/platform/soc/${ro.boot.bootdevice} + symlink /dev/block/platform/soc/${ro.boot.bootdevice} /dev/block/bootdevice chmod 0660 /dev/qseecom chown system drmrpc /dev/qseecom chmod 0664 /dev/ion chown system system /dev/ion install_keyring - - # Mount firmware - mount vfat /dev/block/bootdevice/by-name/modem /firmware ro shortname=lower uid=1000 gid=1000 dmask=227 fmask=337 - - # Only needed when we don't include all required blobs for crypto - #start prepdecrypt setprop crypto.ready 1 -service prepdecrypt /sbin/prepdecrypt.sh - oneshot +# Separate copy needed to use /sbin/linker64 instead of /system/bin/linker64 +service sbinqseecomd /sbin/qseecomd user root group root disabled seclabel u:r:recovery:s0 -# Separate copy needed to use /sbin/linker64 instead of /system/bin/linker64 -service sbinqseecomd /sbin/qseecomd +service hwservicemanager /sbin/hwservicemanager user root group root disabled + onrestart setprop hwservicemanager.ready false seclabel u:r:recovery:s0 -service hwservicemanager /sbin/hwservicemanager +service boot-1-0 /sbin/android.hardware.boot@1.0-service user root group root disabled - onrestart setprop hwservicemanager.ready false seclabel u:r:recovery:s0 service servicemanager /sbin/servicemanager @@ -78,45 +68,43 @@ service keystore_auth /sbin/keystore_auth disabled seclabel u:r:recovery:s0 -service keystore /sbin/keystore /data/misc/keystore +# keystore is started and stopped on demand by TWRP +service keystore /sbin/keystore /tmp/misc/keystore user root group root drmrpc readproc disabled seclabel u:r:recovery:s0 -service gatekeeper-1-0 /sbin/android.hardware.gatekeeper@1.0-service +service gatekeeper-1-0 /sbin/android.hardware.gatekeeper@1.0-service-qti user root group root disabled seclabel u:r:recovery:s0 -service keymaster-3-0 /sbin/android.hardware.keymaster@3.0-service +service keymaster-3-0 /sbin/android.hardware.keymaster@3.0-service-qti user root group root disabled seclabel u:r:recovery:s0 on boot - # Workaround for adb not coming up - setprop sys.usb.config mtp,adb - setprop sys.usb.config adb - - # Enable OTG - write /sys/devices/soc/800f000.qcom,spmi/spmi-0/spmi0-02/800f000.qcom,spmi:qcom,pmi8998@2:qcom,qpnp-smb2/power_supply/usb/otg_switch 1 + write /proc/touchpanel/gesture_enable 1 + write /sys/devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pmi8998@2:qcom,qpnp-smb2/power_supply/usb/otg_switch 1 + +on init + start hwservicemanager + start boot-1-0 on property:crypto.ready=0 stop sbinqseecomd stop keymaster-3-0 stop gatekeeper-1-0 - stop hwservicemanager - stop keystore stop servicemanager on property:crypto.ready=1 start sbinqseecomd on property:sys.listeners.registered=true - start hwservicemanager start keymaster-3-0 start gatekeeper-1-0 start servicemanager diff --git a/recovery/root/init.recovery.usb.rc b/recovery/root/init.recovery.usb.rc index f64186e..01c6b76 100644 --- a/recovery/root/init.recovery.usb.rc +++ b/recovery/root/init.recovery.usb.rc @@ -1,4 +1,4 @@ -# Copyright (c) 2011-2012, The Linux Foundation. All rights reserved. +# Copyright (c) 2011-2016, 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: @@ -26,6 +26,7 @@ # on boot + write /sys/class/android_usb/android0/iSerial ${ro.serialno} mkdir /dev/usb-ffs 0770 shell shell mkdir /dev/usb-ffs/adb 0770 shell shell mount configfs none /config @@ -40,22 +41,26 @@ on boot mkdir /config/usb_gadget/g1/functions/mtp.gs0 mkdir /config/usb_gadget/g1/functions/ptp.gs1 mkdir /config/usb_gadget/g1/functions/accessory.gs2 - mkdir /config/usb_gadget/g1/functions/audio_source.gs2 mkdir /config/usb_gadget/g1/functions/audio_source.gs3 mkdir /config/usb_gadget/g1/functions/midi.gs5 mkdir /config/usb_gadget/g1/functions/ffs.adb mkdir /config/usb_gadget/g1/functions/diag.diag + mkdir /config/usb_gadget/g1/functions/diag.diag_mdm mkdir /config/usb_gadget/g1/functions/cser.dun.0 mkdir /config/usb_gadget/g1/functions/cser.nmea.1 + mkdir /config/usb_gadget/g1/functions/cser.dun.2 mkdir /config/usb_gadget/g1/functions/gsi.rmnet mkdir /config/usb_gadget/g1/functions/gsi.rndis mkdir /config/usb_gadget/g1/functions/gsi.dpl mkdir /config/usb_gadget/g1/functions/qdss.qdss + mkdir /config/usb_gadget/g1/functions/qdss.qdss_mdm mkdir /config/usb_gadget/g1/functions/rndis_bam.rndis mkdir /config/usb_gadget/g1/functions/rmnet_bam.rmnet mkdir /config/usb_gadget/g1/functions/rmnet_bam.dpl mkdir /config/usb_gadget/g1/functions/ncm.0 mkdir /config/usb_gadget/g1/functions/ccid.ccid + mkdir /config/usb_gadget/g1/functions/uac2.0 + mkdir /config/usb_gadget/g1/functions/uvc.0 mkdir /config/usb_gadget/g1/configs/b.1 0770 shell shell mkdir /config/usb_gadget/g1/configs/b.1/strings/0x409 0770 shell shell write /config/usb_gadget/g1/os_desc/b_vendor_code 0x1 @@ -68,9 +73,16 @@ on property:sys.usb.config=none write /config/usb_gadget/g1/UDC "none" stop adbd setprop sys.usb.ffs.ready 0 + setprop sys.usb.ffs.mtp.ready 0 write /config/usb_gadget/g1/bDeviceClass 0 write /config/usb_gadget/g1/bDeviceSubClass 0 write /config/usb_gadget/g1/bDeviceProtocol 0 + rm /config/usb_gadget/g1/configs/b.1/f1 + rm /config/usb_gadget/g1/configs/b.1/f2 + rm /config/usb_gadget/g1/configs/b.1/f3 + rm /config/usb_gadget/g1/configs/b.1/f4 + rm /config/usb_gadget/g1/configs/b.1/f5 + rmdir /config/usb_gadget/g1/functions/rndis.gs4 setprop sys.usb.state ${sys.usb.config} on property:sys.usb.config=adb @@ -83,7 +95,7 @@ on property:sys.usb.ffs.ready=1 && property:sys.usb.config=adb rm /config/usb_gadget/g1/configs/b.1/f3 rm /config/usb_gadget/g1/configs/b.1/f4 rm /config/usb_gadget/g1/configs/b.1/f5 - write /config/usb_gadget/g1/idVendor 0x18d1 + write /config/usb_gadget/g1/idVendor 0x2A70 write /config/usb_gadget/g1/idProduct 0x4ee7 symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f1 write /config/usb_gadget/g1/UDC ${sys.usb.controller} @@ -96,8 +108,8 @@ on property:sys.usb.config=mtp rm /config/usb_gadget/g1/configs/b.1/f3 rm /config/usb_gadget/g1/configs/b.1/f4 rm /config/usb_gadget/g1/configs/b.1/f5 - write /config/usb_gadget/g1/idVendor 0x2717 - write /config/usb_gadget/g1/idProduct 0xff40 + write /config/usb_gadget/g1/idVendor 0x2A70 + write /config/usb_gadget/g1/idProduct 0XF003 symlink /config/usb_gadget/g1/functions/mtp.gs0 /config/usb_gadget/g1/configs/b.1/f1 write /config/usb_gadget/g1/UDC ${sys.usb.controller} setprop sys.usb.state ${sys.usb.config} @@ -112,9 +124,13 @@ on property:sys.usb.ffs.ready=1 && property:sys.usb.config=mtp,adb rm /config/usb_gadget/g1/configs/b.1/f3 rm /config/usb_gadget/g1/configs/b.1/f4 rm /config/usb_gadget/g1/configs/b.1/f5 - write /config/usb_gadget/g1/idVendor 0x2717 - write /config/usb_gadget/g1/idProduct 0xff48 + write /config/usb_gadget/g1/idVendor 0x2A70 + write /config/usb_gadget/g1/idProduct 0x9011 symlink /config/usb_gadget/g1/functions/mtp.gs0 /config/usb_gadget/g1/configs/b.1/f1 symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f2 write /config/usb_gadget/g1/UDC ${sys.usb.controller} setprop sys.usb.state ${sys.usb.config} + +on property:ro.boot.usbcontroller=* + setprop sys.usb.controller ${ro.boot.usbcontroller} + diff --git a/recovery/root/sbin/android.hardware.boot@1.0-service b/recovery/root/sbin/android.hardware.boot@1.0-service new file mode 100644 index 0000000..a9b918d Binary files /dev/null and b/recovery/root/sbin/android.hardware.boot@1.0-service differ diff --git a/recovery/root/sbin/android.hardware.boot@1.0.so b/recovery/root/sbin/android.hardware.boot@1.0.so new file mode 100644 index 0000000..096f604 Binary files /dev/null and b/recovery/root/sbin/android.hardware.boot@1.0.so differ diff --git a/recovery/root/sbin/android.hardware.gatekeeper@1.0-service b/recovery/root/sbin/android.hardware.gatekeeper@1.0-service deleted file mode 100755 index 8cf08ff..0000000 Binary files a/recovery/root/sbin/android.hardware.gatekeeper@1.0-service and /dev/null differ diff --git a/recovery/root/sbin/android.hardware.gatekeeper@1.0-service-qti b/recovery/root/sbin/android.hardware.gatekeeper@1.0-service-qti new file mode 100644 index 0000000..eb88d01 Binary files /dev/null and b/recovery/root/sbin/android.hardware.gatekeeper@1.0-service-qti differ diff --git a/recovery/root/sbin/android.hardware.keymaster@3.0-service b/recovery/root/sbin/android.hardware.keymaster@3.0-service deleted file mode 100755 index d697540..0000000 Binary files a/recovery/root/sbin/android.hardware.keymaster@3.0-service and /dev/null differ diff --git a/recovery/root/sbin/android.hardware.keymaster@3.0-service-qti b/recovery/root/sbin/android.hardware.keymaster@3.0-service-qti new file mode 100644 index 0000000..ed0fe3c Binary files /dev/null and b/recovery/root/sbin/android.hardware.keymaster@3.0-service-qti differ diff --git a/recovery/root/sbin/android.hidl.base@1.0.so b/recovery/root/sbin/android.hidl.base@1.0.so old mode 100755 new mode 100644 index 21a6ed7..1f78ccf Binary files a/recovery/root/sbin/android.hidl.base@1.0.so and b/recovery/root/sbin/android.hidl.base@1.0.so differ diff --git a/recovery/root/sbin/prepdecrypt.sh b/recovery/root/sbin/prepdecrypt.sh deleted file mode 100644 index 6b84894..0000000 --- a/recovery/root/sbin/prepdecrypt.sh +++ /dev/null @@ -1,62 +0,0 @@ -#!/sbin/sh - -relink() -{ - fname=$(basename "$1") - target="/sbin/$fname" - sed 's|/system/bin/linker64|///////sbin/linker64|' "$1" > "$target" - chmod 755 $target -} - -mkdir /s -mount -t ext4 -o ro /dev/block/bootdevice/by-name/system /s - -if [ -f /s/build.prop ]; then - osver=$(grep -i 'ro.build.version.release' /s/build.prop | cut -f2 -d'=') - patchlevel=$(grep -i 'ro.build.version.security_patch' /s/build.prop | cut -f2 -d'=') - setprop ro.build.version.release "$osver" - setprop ro.build.version.security_patch "$patchlevel" -fi - -mkdir -p /vendor/lib64/hw/ - -relink /s/xbin/strace - -cp /s/lib64/android.hidl.base@1.0.so /sbin/ - -relink /s/vendor/bin/qseecomd - -cp /s/vendor/lib64/libdiag.so /vendor/lib64/ -cp /s/vendor/lib64/libdrmfs.so /vendor/lib64/ -cp /s/vendor/lib64/libdrmtime.so /vendor/lib64/ -cp /s/vendor/lib64/libGPreqcancel.so /vendor/lib64/ -cp /s/vendor/lib64/libGPreqcancel_svc.so /vendor/lib64/ -cp /s/vendor/lib64/libqisl.so /vendor/lib64/ -cp /s/vendor/lib64/libQSEEComAPI.so /vendor/lib64/ -cp /s/vendor/lib64/librpmb.so /vendor/lib64/ -cp /s/vendor/lib64/libsecureui.so /vendor/lib64/ -cp /s/vendor/lib64/libSecureUILib.so /vendor/lib64/ -cp /s/vendor/lib64/libsecureui_svcsock.so /vendor/lib64/ -cp /s/vendor/lib64/libspl.so /vendor/lib64/ -cp /s/vendor/lib64/libssd.so /vendor/lib64/ -cp /s/vendor/lib64/libStDrvInt.so /vendor/lib64/ -cp /s/vendor/lib64/libtime_genoff.so /vendor/lib64/ -cp /s/vendor/lib64/libkeymasterdeviceutils.so /vendor/lib64/ -cp /s/vendor/lib64/libkeymasterprovision.so /vendor/lib64/ -cp /s/vendor/lib64/libkeymasterutils.so /vendor/lib64/ -cp /s/vendor/lib64/vendor.qti.hardware.tui_comm@1.0_vendor.so /vendor/lib64/ -cp /s/vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl.so /vendor/lib64/hw/ -cp /s/vendor/lib64/hw/android.hardware.keymaster@3.0-impl.so /vendor/lib64/hw/ -cp /s/vendor/lib64/hw/gatekeeper.msm8998.so /vendor/lib64/hw/ -cp /s/vendor/lib64/hw/keystore.msm8998.so /vendor/lib64/hw/ - -cp /s/vendor/manifest.xml /vendor/ -cp /s/vendor/compatibility_matrix.xml /vendor/ - -relink /s/vendor/bin/hw/android.hardware.gatekeeper@1.0-service -relink /s/vendor/bin/hw/android.hardware.keymaster@3.0-service - -umount /s - -setprop crypto.ready 1 -exit 0 diff --git a/recovery/root/sbin/qseecomd b/recovery/root/sbin/qseecomd index 9c22507..0136ea5 100755 Binary files a/recovery/root/sbin/qseecomd and b/recovery/root/sbin/qseecomd differ diff --git a/recovery/root/ueventd.qcom.rc b/recovery/root/ueventd.qcom.rc index 43bc445..36b347d 100644 --- a/recovery/root/ueventd.qcom.rc +++ b/recovery/root/ueventd.qcom.rc @@ -118,6 +118,7 @@ /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/qsee_ipc_irq_spss 0660 system drmrpc /dev/seemplog 0660 system system @@ -232,6 +233,10 @@ /sys/devices/soc/78b7000.i2c/i2c-3/3-004b/input/input* secure_touch_enable 0660 system drmrpc /sys/devices/soc/c179000.i2c/i2c-5/5-0020/input/input* secure_touch 0440 system drmrpc /sys/devices/soc/c179000.i2c/i2c-5/5-0020/input/input* secure_touch_enable 0660 system drmrpc +/sys/devices/platform/soc/a98000.i2c/i2c-2/2-0020/input/input* secure_touch 0440 system drmrpc +/sys/devices/platform/soc/a98000.i2c/i2c-2/2-0020/input/input* secure_touch_enable 0660 system drmrpc +/sys/devices/platform/soc/a84000.i2c/i2c-2/2-0020/input/input* secure_touch 0440 system drmrpc +/sys/devices/platform/soc/a84000.i2c/i2c-2/2-0020/input/input* secure_touch_enable 0660 system drmrpc # laser sensor access /sys/devices/virtual/input/input* enable_ps_sensor 0660 system input @@ -251,6 +256,7 @@ # wigig /sys/bus/pci/drivers/wil6210* 0000:01:00.0/wil6210/fst_link_loss 0660 wifi wifi /sys/bus/pci/drivers/wil6210* 0000:01:00.0/wil6210/thermal_throttling 0660 system system +/sys/bus/pci/drivers/wil6210* 0000:01:00.0/wil6210/snr_thresh 0660 wifi wifi /sys/bus/pci/drivers/wil6210* 0000:01:00.0/net/wigig0/queues/rx-0/rps_cpus 0660 system system /sys/bus/pci/drivers/wil6210* 0000:01:00.0/net/wigig0/gro_flush_timeout 0660 system system /sys/devices/virtual/net/bond0 queues/rx-0/rps_cpus 0660 system system @@ -288,6 +294,7 @@ /dev/block/platform/soc/1da4000.ufshc/by-name/frp 0600 system system /dev/block/platform/soc/c0c4000.sdhci/by-name/frp 0600 system system /dev/block/platform/soc/1d84000.ufshc/by-name/frp 0600 system system +/dev/block/platform/soc/7c4000.sdhci/by-name/frp 0600 system system # Kmsg device /dev/kmsg 0620 root system diff --git a/recovery/root/vendor/lib64/hw/android.hardware.boot@1.0-impl.so b/recovery/root/vendor/lib64/hw/android.hardware.boot@1.0-impl.so new file mode 100644 index 0000000..a162f10 Binary files /dev/null and b/recovery/root/vendor/lib64/hw/android.hardware.boot@1.0-impl.so 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 new file mode 100644 index 0000000..07b4a77 Binary files /dev/null and b/recovery/root/vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so differ diff --git a/recovery/root/vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl.so b/recovery/root/vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl.so deleted file mode 100755 index fedb441..0000000 Binary files a/recovery/root/vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl.so and /dev/null differ diff --git a/recovery/root/vendor/lib64/hw/android.hardware.keymaster@3.0-impl-qti.so b/recovery/root/vendor/lib64/hw/android.hardware.keymaster@3.0-impl-qti.so new file mode 100755 index 0000000..802214a Binary files /dev/null and b/recovery/root/vendor/lib64/hw/android.hardware.keymaster@3.0-impl-qti.so differ diff --git a/recovery/root/vendor/lib64/hw/android.hardware.keymaster@3.0-impl.so b/recovery/root/vendor/lib64/hw/android.hardware.keymaster@3.0-impl.so deleted file mode 100755 index b65668c..0000000 Binary files a/recovery/root/vendor/lib64/hw/android.hardware.keymaster@3.0-impl.so and /dev/null differ diff --git a/recovery/root/vendor/lib64/hw/bootctrl.sdm845.so b/recovery/root/vendor/lib64/hw/bootctrl.sdm845.so new file mode 100644 index 0000000..ed5b570 Binary files /dev/null and b/recovery/root/vendor/lib64/hw/bootctrl.sdm845.so differ diff --git a/recovery/root/vendor/lib64/hw/gatekeeper.msm8998.so b/recovery/root/vendor/lib64/hw/gatekeeper.msm8998.so deleted file mode 100644 index 61fe47f..0000000 Binary files a/recovery/root/vendor/lib64/hw/gatekeeper.msm8998.so and /dev/null differ diff --git a/recovery/root/vendor/lib64/hw/keystore.msm8998.so b/recovery/root/vendor/lib64/hw/keystore.msm8998.so deleted file mode 100644 index 51b6f2d..0000000 Binary files a/recovery/root/vendor/lib64/hw/keystore.msm8998.so and /dev/null differ diff --git a/recovery/root/vendor/lib64/libGPreqcancel.so b/recovery/root/vendor/lib64/libGPreqcancel.so index 62fde76..7fb087f 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 ce0063e..9b6f270 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 old mode 100644 new mode 100755 index 63fabbb..f8ebc04 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 8003907..d460f92 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 cfa0c19..51f9769 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 old mode 100644 new mode 100755 index 491670e..8ac11d9 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/libdrmfs.so b/recovery/root/vendor/lib64/libdrmfs.so old mode 100644 new mode 100755 index 27ab939..22dcc8e 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 4fc834e..787b11b 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/libicuuc.so b/recovery/root/vendor/lib64/libicuuc.so new file mode 100755 index 0000000..babb335 Binary files /dev/null and b/recovery/root/vendor/lib64/libicuuc.so differ diff --git a/recovery/root/vendor/lib64/libkeymasterdeviceutils.so b/recovery/root/vendor/lib64/libkeymasterdeviceutils.so index 39e07cf..496a6aa 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 7fd1904..0cdde6d 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 05931f5..aab5690 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/libqisl.so b/recovery/root/vendor/lib64/libqisl.so index 0af9129..3d9e765 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/librecovery_updater_msm.so b/recovery/root/vendor/lib64/librecovery_updater_msm.so new file mode 100644 index 0000000..2fe05a2 Binary files /dev/null and b/recovery/root/vendor/lib64/librecovery_updater_msm.so differ diff --git a/recovery/root/vendor/lib64/librpmb.so b/recovery/root/vendor/lib64/librpmb.so old mode 100644 new mode 100755 index 085be11..2891ac2 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 ff5d45d..9abd9da 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 47679f4..94357b6 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/libspcom.so b/recovery/root/vendor/lib64/libspcom.so new file mode 100644 index 0000000..757b2c2 Binary files /dev/null and b/recovery/root/vendor/lib64/libspcom.so differ diff --git a/recovery/root/vendor/lib64/libspl.so b/recovery/root/vendor/lib64/libspl.so index fbc4177..3d61e79 100644 Binary files a/recovery/root/vendor/lib64/libspl.so and b/recovery/root/vendor/lib64/libspl.so differ diff --git a/recovery/root/vendor/lib64/libssd.so b/recovery/root/vendor/lib64/libssd.so old mode 100644 new mode 100755 index 418e1ef..b954525 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 old mode 100755 new mode 100644 index 8c32217..22212ee 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/libxml2.so b/recovery/root/vendor/lib64/libxml2.so new file mode 100755 index 0000000..f73d58b Binary files /dev/null and b/recovery/root/vendor/lib64/libxml2.so differ diff --git a/recovery/root/vendor/lib64/vendor.qti.hardware.tui_comm@1.0_vendor.so b/recovery/root/vendor/lib64/vendor.qti.hardware.tui_comm@1.0_vendor.so index 303b061..4972c57 100644 Binary files a/recovery/root/vendor/lib64/vendor.qti.hardware.tui_comm@1.0_vendor.so and b/recovery/root/vendor/lib64/vendor.qti.hardware.tui_comm@1.0_vendor.so differ diff --git a/recovery/root/vendor/manifest.xml b/recovery/root/vendor/manifest.xml index 3993b26..06b14cd 100644 --- a/recovery/root/vendor/manifest.xml +++ b/recovery/root/vendor/manifest.xml @@ -5,7 +5,7 @@ 2.0 IDevicesFactory - msm8998 + default @@ -36,17 +36,17 @@ - android.hardware.broadcastradio + android.hardware.boot hwbinder 1.0 - IBroadcastRadioFactory + IBootControl default android.hardware.camera.provider - passthrough + hwbinder 2.4 ICameraProvider @@ -71,6 +71,15 @@ default + + android.hardware.contexthub + hwbinder + 1.0 + + IContexthub + default + + android.hardware.drm hwbinder @@ -92,7 +101,7 @@ 1.0 IGatekeeper - msm8998 + default @@ -101,7 +110,7 @@ 1.0 IGnss - msm8998 + default @@ -110,7 +119,7 @@ 2.0 IAllocator - msm8998 + default @@ -119,7 +128,7 @@ 2.1 IComposer - msm8998 + default @@ -131,13 +140,22 @@ default + + android.hardware.health + hwbinder + 1.0 + + IHealth + default + + android.hardware.keymaster hwbinder 3.0 IKeymasterDevice - msm8998 + default @@ -146,7 +164,7 @@ 2.0 ILight - msm8998 + default @@ -168,7 +186,7 @@ 1.0 IMemtrack - msm8998 + default @@ -183,7 +201,7 @@ android.hardware.power hwbinder - 1.1 + 1.0 IPower default @@ -229,7 +247,16 @@ 1.0 ISensors - msm8998 + default + + + + android.hardware.soundtrigger + hwbinder + 2.0 + + ISoundTriggerHw + default @@ -256,7 +283,7 @@ 1.0 IThermal - msm8998 + default @@ -304,6 +331,57 @@ default + + com.fingerprints.extension + hwbinder + 1.0 + + IFingerprintAuthenticator + default + + + IFingerprintCalibration + default + + + IFingerprintEngineering + default + + + IFingerprintNavigation + default + + + IFingerprintRecalibration + default + + + IFingerprintSenseTouch + default + + + IFingerprintSensorTest + default + + + + com.qualcomm.qti.ant + hwbinder + 1.0 + + IAntHci + default + + + + com.qualcomm.qti.bluetooth_audio + hwbinder + 1.0 + + IBluetoothAudio + default + + com.qualcomm.qti.dpm.api hwbinder @@ -383,7 +461,7 @@ vendor.display.config hwbinder - 1.0 + 1.1 IDisplayConfig default @@ -398,6 +476,24 @@ default + + vendor.nxp.hardware.nfc + hwbinder + 1.0 + + INqNfc + default + + + + vendor.oneplus.hardware.wifi + hwbinder + 1.0 + + IOneplusWifi + default + + vendor.qti.esepowermanager hwbinder @@ -410,7 +506,7 @@ vendor.qti.gnss hwbinder - 1.0 + 1.1 ILocHidlGnss gnss_vendor @@ -425,6 +521,33 @@ default + + vendor.qti.hardware.data.latency + hwbinder + 1.0 + + ILinkLatency + default + + + + vendor.qti.hardware.factory + hwbinder + 1.0 + + IFactory + default + + + + vendor.qti.hardware.fm + hwbinder + 1.0 + + IFmHci + default + + vendor.qti.hardware.improvetouch.blobmanager hwbinder @@ -452,6 +575,15 @@ TouchCompanionService + + vendor.qti.hardware.iop + hwbinder + 2.0 + + IIop + default + + vendor.qti.hardware.perf hwbinder @@ -582,6 +714,15 @@ uimRemoteServer1 + + vendor.qti.hardware.sensorscalibrate + hwbinder + 1.0 + + ISensorsCalibrate + default + + vendor.qti.hardware.tui_comm hwbinder @@ -591,6 +732,42 @@ default + + vendor.qti.hardware.vpp + hwbinder + 1.1 + + IHidlVppService + vppService + + + + vendor.qti.hardware.wifi.keystore + hwbinder + 1.0 + + IKeystoreExt + default + + + + vendor.qti.hardware.wigig.netperftuner + hwbinder + 1.0 + + INetPerfTuner + default + + + + vendor.qti.hardware.wigig.supptunnel + hwbinder + 1.0 + + ISuppTunnelProvider + default + + vendor.qti.imsrtpservice hwbinder diff --git a/system.prop b/system.prop index 2e5085b..9f43165 100644 --- a/system.prop +++ b/system.prop @@ -1,4 +1 @@ -ro.display.series=OnePlus 5T -sys.usb.controller=a800000.dwc3 -sys.usb.rndis.func.name=gsi -sys.usb.rmnet.func.name=gsi +ro.display.series=OnePlus 6 diff --git a/vendorsetup.sh b/vendorsetup.sh index 1f0497d..edb5351 100644 --- a/vendorsetup.sh +++ b/vendorsetup.sh @@ -1,2 +1,2 @@ -add_lunch_combo omni_dumpling-eng -add_lunch_combo omni_dumpling-userdebug +add_lunch_combo omni_enchilada-eng +add_lunch_combo omni_enchilada-userdebug