diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 71e0aff..9b3b4d6 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -15,4 +15,4 @@ # PRODUCT_MAKEFILES := \ - $(LOCAL_DIR)/omni_FP3.mk + $(LOCAL_DIR)/twrp_FP3.mk diff --git a/BoardConfig.mk b/BoardConfig.mk index 7da56c5..c2b3627 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -29,6 +29,8 @@ TARGET_2ND_CPU_ABI := armeabi-v7a TARGET_2ND_CPU_ABI2 := armeabi TARGET_2ND_CPU_VARIANT := cortex-a53 +TARGET_SUPPORTS_64_BIT_APPS := true + # Bootloader TARGET_BOOTLOADER_BOARD_NAME := msm8953 TARGET_NO_BOOTLOADER := true @@ -38,9 +40,9 @@ TARGET_BOARD_PLATFORM := msm8953 # Kernel BOARD_KERNEL_BASE := 0x80000000 -BOARD_KERNEL_CMDLINE := console=ttyMSM0,115200,n8 androidboot.console=ttyMSM0 androidboot.hardware=qcom msm_rtb.filter=0x237 -BOARD_KERNEL_CMDLINE += ehci-hcd.park=3 lpm_levels.sleep_disabled=1 androidboot.bootdevice=7824900.sdhci earlycon=msm_serial_dm,0x78af000 -BOARD_KERNEL_CMDLINE += firmware_class.path=/vendor/firmware_mnt/image androidboot.usbconfigfs=true loop.max_part=7 +BOARD_KERNEL_CMDLINE := androidboot.console=ttyMSM0 androidboot.hardware=qcom msm_rtb.filter=0x237 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 +BOARD_KERNEL_CMDLINE += androidboot.bootdevice=7824900.sdhci earlycon=msm_serial_dm,0x78af000 androidboot.usbconfigfs=true loop.max_part=7 +BOARD_KERNEL_CMDLINE += androidboot.boot_devices=soc/7824900.sdhci androidboot.super_partition=system BOARD_KERNEL_IMAGE_NAME := Image.gz-dtb BOARD_KERNEL_PAGESIZE := 2048 TARGET_PREBUILT_KERNEL := $(DEVICE_PATH)/prebuilt/Image.gz-dtb @@ -50,24 +52,36 @@ TARGET_KERNEL_CONFIG := fp3_twrp_defconfig TARGET_KERNEL_SOURCE := kernel/fairphone/sdm632 endif +# Retrofit dynamic partitions +BOARD_SUPER_PARTITION_BLOCK_DEVICES := system vendor product +BOARD_SUPER_PARTITION_METADATA_DEVICE := system +BOARD_SUPER_PARTITION_SYSTEM_DEVICE_SIZE := 3221225472 +BOARD_SUPER_PARTITION_VENDOR_DEVICE_SIZE := 1073741824 +BOARD_SUPER_PARTITION_PRODUCT_DEVICE_SIZE := 134217728 +BOARD_SUPER_PARTITION_SIZE := 4429185024 +BOARD_SUPER_PARTITION_GROUPS := dynamic_partitions +BOARD_DYNAMIC_PARTITIONS_SIZE := $(BOARD_SUPER_PARTITION_SIZE) +BOARD_DYNAMIC_PARTITIONS_PARTITION_LIST := system vendor odm product system_ext + # Partitions BOARD_FLASH_BLOCK_SIZE := 131072 BOARD_BOOTIMAGE_PARTITION_SIZE := 67108864 BOARD_RECOVERYIMAGE_PARTITION_SIZE := 67108864 BOARD_DTBOIMG_PARTITION_SIZE := 8388608 -BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3221225472 BOARD_USERDATAIMAGE_PARTITION_SIZE := 52335451136 -BOARD_BUILD_SYSTEM_ROOT_IMAGE := true BOARD_USES_RECOVERY_AS_BOOT := true TARGET_USERIMAGES_USE_EXT4 := true # Platform PLATFORM_VERSION := 16.1.0 PLATFORM_SECURITY_PATCH := 2030-01-01 +VENDOR_SECURITY_PATCH := $(PLATFORM_SECURITY_PATCH) # Crypto TW_INCLUDE_CRYPTO := true TW_INCLUDE_CRYPTO_FBE := true +BOARD_USES_QCOM_FBE_DECRYPTION := true +TW_USE_FSCRYPT_POLICY := 1 # TWRP RECOVERY_SDCARD_ON_DATA := true @@ -80,7 +94,6 @@ TW_SCREEN_BLANK_ON_BOOT := true TW_THEME := portrait_hdpi TW_USE_TOOLBOX := true TW_OVERRIDE_SYSTEM_PROPS := "ro.build.fingerprint;ro.build.version.incremental" -PRODUCT_EXTRA_RECOVERY_KEYS := $(DEVICE_PATH)/releasekey TARGET_USE_CUSTOM_LUN_FILE_PATH := /config/usb_gadget/g1/functions/mass_storage.0/lun.%d/file # Debug flags diff --git a/README.md b/README.md index 7bc126f..b2b69a0 100644 --- a/README.md +++ b/README.md @@ -18,22 +18,15 @@ Rear Camera | 12 MP (f/1.8, 1/2.55", PDAF) Front Camera | 8 MP (f/2.0, 1/4", HDR) ### Kernel Source -https://code.fairphone.com/projects/fairphone-3-gpl.html +https://code.fairphone.com/projects/fairphone-3/gpl.html -### Build with TWRP installer -To automatically build the twrp-installer, pick this: - -```sh -https://gerrit.omnirom.org/#/c/android_build/+/33182/ -``` ### How to compile ```sh . build/envsetup.sh export ALLOW_MISSING_DEPENDENCIES=true -export DTC_EXT=$PWD/prebuilts/misc/linux-x86/dtc/dtc -lunch omni_fp3-eng -mka recoveryimage +lunch twrp_FP3-eng +mka bootimage ``` ### Copyright ``` diff --git a/prebuilt/Image.gz-dtb b/prebuilt/Image.gz-dtb index 72b60ff..0cabe54 100644 Binary files a/prebuilt/Image.gz-dtb and b/prebuilt/Image.gz-dtb differ diff --git a/recovery/root/etc/recovery.fstab b/recovery/root/etc/recovery.fstab deleted file mode 100644 index aec708a..0000000 --- a/recovery/root/etc/recovery.fstab +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright (c) 2018, 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: -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following -# disclaimer in the documentation and/or other materials provided -# with the distribution. -# * Neither the name of The Linux Foundation nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS -# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# Android fstab file. -# The filesystem that contains the filesystem checker binary (typically /system) cannot -# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK - -#TODO: Add 'check' as fs_mgr_flags with data partition. -# Currently we dont have e2fsck compiled. So fs check would failed. - -# -/dev/block/bootdevice/by-name/system / ext4 ro,barrier=1 wait,slotselect,avb -/dev/block/bootdevice/by-name/vendor / ext4 ro,barrier=1 wait,slotselect,avb -/dev/block/bootdevice/by-name/userdata /data ext4 noatime,nosuid,nodev,barrier=1,data=ordered,noauto_da_alloc wait,check,length=-16384 -/dev/block/mmcblk1p1 /sdcard vfat nosuid,nodev wait - -/dev/block/bootdevice/by-name/boot /boot emmc defaults defaults -/dev/block/bootdevice/by-name/misc /misc emmc defaults defaults -#/devices/platform/soc/7864900.sdhci/mmc_host* /storage/sdcard1 vfat nosuid,nodev wait,voldmanaged=sdcard1:auto,noemulatedsd,encryptable=footer -/devices/platform/soc/7864900.sdhci/mmc_host* /storage/sdcard1 vfat nosuid,nodev wait,voldmanaged=sdcard1:auto,noemulatedsd -/devices/platform/soc/7000000.ssusb/7000000.dwc3/xhci-hcd.0.auto* /storage/usbotg vfat nosuid,nodev wait,voldmanaged=usbotg:auto -#/devices/soc/7864900.sdhci/mmc_host* /storage/sdcard1 vfat nosuid,nodev wait,voldmanaged=sdcard1:auto,noemulatedsd,encryptable=footer -/devices/soc/7864900.sdhci/mmc_host* /storage/sdcard1 vfat nosuid,nodev wait,voldmanaged=sdcard1:auto,noemulatedsd -/devices/soc/7000000.ssusb/7000000.dwc3/xhci-hcd.0.auto* /storage/usbotg vfat nosuid,nodev wait,voldmanaged=usbotg:auto -/dev/block/bootdevice/by-name/config /frp emmc defaults defaults -/dev/block/bootdevice/by-name/misc /misc emmc defaults defaults -/dev/block/bootdevice/by-name/modem /vendor/firmware_mnt vfat ro,shortname=lower,uid=0,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait,slotselect -/dev/block/bootdevice/by-name/dsp /vendor/dsp ext4 ro,nosuid,nodev,barrier=1 wait,slotselect -/dev/block/bootdevice/by-name/persist /mnt/vendor/persist ext4 noatime,nosuid,nodev,barrier=1 wait -/dev/block/bootdevice/by-name/product /product ext4 ro,noatime,nosuid,nodev,barrier=1 wait,slotselect diff --git a/recovery/root/init.recovery.qcom.rc b/recovery/root/init.recovery.qcom.rc index 9528960..7729541 100644 --- a/recovery/root/init.recovery.qcom.rc +++ b/recovery/root/init.recovery.qcom.rc @@ -1,109 +1,41 @@ +# Copyright (c) 2017-2018,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: +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# * Neither the name of The Linux Foundation nor +# the names of its contributors may be used to endorse or promote +# products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +import /init.recovery.qcom_decrypt.rc + +on init + setprop sys.usb.configfs 1 + #setprop prepdecrypt.setpatch true + #setprop prepdecrypt.loglevel 2 + +on property:ro.boot.usbcontroller=* + setprop sys.usb.controller ${ro.boot.usbcontroller} + write /sys/class/udc/${ro.boot.usbcontroller}/device/../mode peripheral + on fs 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 - - setprop ro.board.platform msm8953 - start boot-1-0 - start prepdecrypt - -on boot - setprop sys.usb.config adb - -service prepdecrypt /sbin/prepdecrypt.sh - oneshot - disabled - user root - group root - seclabel u:r:recovery:s0 - -service hwservicemanager /sbin/hwservicemanager - user root - group root - disabled - onrestart setprop hwservicemanager.ready false - seclabel u:r:recovery:s0 - -service servicemanager /sbin/servicemanager - disabled - user root - group root readproc - seclabel u:r:recovery:s0 - writepid /dev/cpuset/system-background/tasks - -# 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 - -service boot-1-0 /sbin/android.hardware.boot@1.0-service - user root - group root - disabled - seclabel u:r:recovery:s0 - -service gatekeeper-1-0 /sbin/android.hardware.gatekeeper@1.0-service-qti - user root - group root - disabled - seclabel u:r:recovery:s0 - -service keymaster-4-0 /sbin/android.hardware.keymaster@4.0-service-qti - user root - group root - disabled - seclabel u:r:recovery:s0 - -# This helps fix ld.config.txt errors from the linker on Android 8.1+ -service ldconfigtxt /sbin/touch /sbin/ld.config.txt - oneshot - seclabel u:r:recovery:s0 - -on boot - export LD_CONFIG_FILE /sbin/ld.config.txt - # save battery by switching to interactive once booted - write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor interactive - write /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor interactive - write /sys/devices/system/cpu/cpu2/cpufreq/scaling_governor interactive - write /sys/devices/system/cpu/cpu3/cpufreq/scaling_governor interactive - -on property:crypto.ready=1 - start sbinqseecomd - -on property:crypto.ready=0 - stop sbinqseecomd - stop keymaster-4-0 - stop gatekeeper-1-0 - stop hwservicemanager - stop keystore - stop servicemanager - -on property:vendor.sys.listeners.registered=true - start hwservicemanager - start keymaster-4-0 - start gatekeeper-1-0 - start servicemanager - -# Handled by TWRP -service keystore /sbin/keystore /tmp/misc/keystore - disabled - oneshot - user root - group root drmrpc readproc - seclabel u:r:recovery:s0 - writepid /dev/cpuset/foreground/tasks - -service keystore_auth /sbin/keystore_auth - disabled - oneshot - user system - group root - seclabel u:r:recovery:s0 diff --git a/recovery/root/sbin/android.hardware.boot@1.0-service b/recovery/root/sbin/android.hardware.boot@1.0-service deleted file mode 100755 index d1c5e48..0000000 Binary files a/recovery/root/sbin/android.hardware.boot@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 deleted file mode 100755 index 9a1f4a1..0000000 Binary files a/recovery/root/sbin/android.hardware.gatekeeper@1.0-service-qti 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 deleted file mode 100755 index 14926a2..0000000 Binary files a/recovery/root/sbin/android.hardware.keymaster@3.0-service-qti and /dev/null differ diff --git a/recovery/root/sbin/android.hardware.keymaster@4.0-service-qti b/recovery/root/sbin/android.hardware.keymaster@4.0-service-qti deleted file mode 100755 index 54dd42d..0000000 Binary files a/recovery/root/sbin/android.hardware.keymaster@4.0-service-qti and /dev/null differ diff --git a/recovery/root/sbin/ld.config.txt b/recovery/root/sbin/ld.config.txt deleted file mode 100644 index 6f9caee..0000000 --- a/recovery/root/sbin/ld.config.txt +++ /dev/null @@ -1,348 +0,0 @@ -# Copyright (C) 2017 The Android Open Source Project -# -# Bionic loader config file. -# - -# Don't change the order here. The first pattern that matches with the -# absolute path of an executable is selected. -dir.system = /system/bin/ -dir.system = /system/xbin/ -dir.system = /system/product/bin/ - -dir.vendor = /odm/bin/ -dir.vendor = /vendor/bin/ -dir.vendor = /data/nativetest/odm -dir.vendor = /data/nativetest64/odm -dir.vendor = /data/benchmarktest/odm -dir.vendor = /data/benchmarktest64/odm -dir.vendor = /data/nativetest/vendor -dir.vendor = /data/nativetest64/vendor -dir.vendor = /data/benchmarktest/vendor -dir.vendor = /data/benchmarktest64/vendor - -dir.system = /data/nativetest -dir.system = /data/nativetest64 -dir.system = /data/benchmarktest -dir.system = /data/benchmarktest64 - -dir.postinstall = /postinstall - -[system] -additional.namespaces = sphal,vndk,rs - -############################################################################### -# "default" namespace -# -# Framework-side code runs in this namespace. Libs from /vendor partition -# can't be loaded in this namespace. -############################################################################### -namespace.default.isolated = true - -namespace.default.search.paths = /system/${LIB} -namespace.default.search.paths += /system/product/${LIB} - -# We can't have entire /system/${LIB} as permitted paths because doing so -# makes it possible to load libs in /system/${LIB}/vndk* directories by -# their absolute paths (e.g. dlopen("/system/lib/vndk/libbase.so");). -# VNDK libs are built with previous versions of Android and thus must not be -# loaded into this namespace where libs built with the current version of -# Android are loaded. Mixing the two types of libs in the same namespace can -# cause unexpected problem. -namespace.default.permitted.paths = /system/${LIB}/drm -namespace.default.permitted.paths += /system/${LIB}/extractors -namespace.default.permitted.paths += /system/${LIB}/hw -namespace.default.permitted.paths += /system/product/${LIB} -# These are where odex files are located. libart has to be able to dlopen the files -namespace.default.permitted.paths += /system/framework -namespace.default.permitted.paths += /system/app -namespace.default.permitted.paths += /system/priv-app -namespace.default.permitted.paths += /vendor/framework -namespace.default.permitted.paths += /vendor/app -namespace.default.permitted.paths += /vendor/priv-app -namespace.default.permitted.paths += /odm/framework -namespace.default.permitted.paths += /odm/app -namespace.default.permitted.paths += /odm/priv-app -namespace.default.permitted.paths += /oem/app -namespace.default.permitted.paths += /system/product/framework -namespace.default.permitted.paths += /system/product/app -namespace.default.permitted.paths += /system/product/priv-app -namespace.default.permitted.paths += /data -namespace.default.permitted.paths += /mnt/expand - -namespace.default.asan.search.paths = /data/asan/system/${LIB} -namespace.default.asan.search.paths += /system/${LIB} -namespace.default.asan.search.paths += /data/asan/product/${LIB} -namespace.default.asan.search.paths += /product/${LIB} - -namespace.default.asan.permitted.paths = /data -namespace.default.asan.permitted.paths += /system/${LIB}/drm -namespace.default.asan.permitted.paths += /system/${LIB}/extractors -namespace.default.asan.permitted.paths += /system/${LIB}/hw -namespace.default.asan.permitted.paths += /system/framework -namespace.default.asan.permitted.paths += /system/app -namespace.default.asan.permitted.paths += /system/priv-app -namespace.default.asan.permitted.paths += /vendor/framework -namespace.default.asan.permitted.paths += /vendor/app -namespace.default.asan.permitted.paths += /vendor/priv-app -namespace.default.asan.permitted.paths += /odm/framework -namespace.default.asan.permitted.paths += /odm/app -namespace.default.asan.permitted.paths += /odm/priv-app -namespace.default.asan.permitted.paths += /oem/app -namespace.default.asan.permitted.paths += /system/product/${LIB} -namespace.default.asan.permitted.paths += /system/product/framework -namespace.default.asan.permitted.paths += /system/product/app -namespace.default.asan.permitted.paths += /system/product/priv-app -namespace.default.asan.permitted.paths += /mnt/expand - -############################################################################### -# "sphal" namespace -# -# SP-HAL(Sameprocess-HAL)s are the only vendor libraries that are allowed to be -# loaded inside system processes. libEGL_.so, libGLESv2_.so, -# android.hardware.graphics.mapper@2.0-impl.so, etc are SP-HALs. -# -# This namespace is exclusivly for SP-HALs. When the framework tries to dynami- -# cally load SP-HALs, android_dlopen_ext() is used to explicitly specifying -# that they should be searched and loaded from this namespace. -# -# Note that there is no link from the default namespace to this namespace. -############################################################################### -namespace.sphal.isolated = true -namespace.sphal.visible = true - -namespace.sphal.search.paths = /odm/${LIB} -namespace.sphal.search.paths += /vendor/${LIB} - -namespace.sphal.permitted.paths = /odm/${LIB} -namespace.sphal.permitted.paths += /vendor/${LIB} - -namespace.sphal.asan.search.paths = /data/asan/odm/${LIB} -namespace.sphal.asan.search.paths += /odm/${LIB} -namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB} -namespace.sphal.asan.search.paths += /vendor/${LIB} - -namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB} -namespace.sphal.asan.permitted.paths += /odm/${LIB} -namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB} -namespace.sphal.asan.permitted.paths += /vendor/${LIB} - -# Once in this namespace, access to libraries in /system/lib is restricted. Only -# libs listed here can be used. -namespace.sphal.links = default,vndk,rs - -namespace.sphal.link.default.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libc.so:libclang_rt.asan-aarch64-android.so:libclang_rt.asan-arm-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so -namespace.sphal.link.default.shared_libs += libclang_rt.asan-aarch64-android.so:libclang_rt.ubsan_standalone-aarch64-android.so:libclang_rt.tsan-aarch64-android.so:libclang_rt.asan-arm-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.tsan-arm-android.so - -namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0.so:android.hidl.memory@1.0-impl.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbase.so:libbcinfo.so:libc++.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libhidltransport.so:libhwbinder.so:libhwbinder_noltopgo.so:libion.so:liblzma.so:libunwindstack.so:libutils.so:libutilscallstack.so:libz.so - -# Renderscript gets separate namespace -namespace.sphal.link.rs.shared_libs = libRS_internal.so - -############################################################################### -# "rs" namespace -# -# This namespace is exclusively for Renderscript internal libraries. -# This namespace has slightly looser restriction than the vndk namespace because -# of the genuine characteristics of Renderscript; /data is in the permitted path -# to load the compiled *.so file and libmediandk.so can be used here. -############################################################################### -namespace.rs.isolated = true -namespace.rs.visible = true - -namespace.rs.search.paths = /odm/${LIB}/vndk-sp -namespace.rs.search.paths += /vendor/${LIB}/vndk-sp -namespace.rs.search.paths += /system/${LIB}/vndk-sp-28 -namespace.rs.search.paths += /odm/${LIB} -namespace.rs.search.paths += /vendor/${LIB} - -namespace.rs.permitted.paths = /odm/${LIB} -namespace.rs.permitted.paths += /vendor/${LIB} -namespace.rs.permitted.paths += /data - -namespace.rs.asan.search.paths = /data/asan/odm/${LIB}/vndk-sp -namespace.rs.asan.search.paths += /odm/${LIB}/vndk-sp -namespace.rs.asan.search.paths += /data/asan/vendor/${LIB}/vndk-sp -namespace.rs.asan.search.paths += /vendor/${LIB}/vndk-sp -namespace.rs.asan.search.paths += /data/asan/system/${LIB}/vndk-sp-28 -namespace.rs.asan.search.paths += /system/${LIB}/vndk-sp-28 -namespace.rs.asan.search.paths += /data/asan/odm/${LIB} -namespace.rs.asan.search.paths += /odm/${LIB} -namespace.rs.asan.search.paths += /data/asan/vendor/${LIB} -namespace.rs.asan.search.paths += /vendor/${LIB} - -namespace.rs.asan.permitted.paths = /data/asan/odm/${LIB} -namespace.rs.asan.permitted.paths += /odm/${LIB} -namespace.rs.asan.permitted.paths += /data/asan/vendor/${LIB} -namespace.rs.asan.permitted.paths += /vendor/${LIB} -namespace.rs.asan.permitted.paths += /data - -namespace.rs.links = default,vndk - -namespace.rs.link.default.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libc.so:libclang_rt.asan-aarch64-android.so:libclang_rt.asan-arm-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so -namespace.rs.link.default.shared_libs += libclang_rt.asan-aarch64-android.so:libclang_rt.ubsan_standalone-aarch64-android.so:libclang_rt.tsan-aarch64-android.so:libclang_rt.asan-arm-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.tsan-arm-android.so -# Private LLNDK libs (e.g. libft2.so) are exceptionally allowed to this -# namespace because RS framework libs are using them. -namespace.rs.link.default.shared_libs += libft2.so - -namespace.rs.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0.so:android.hidl.memory@1.0-impl.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbase.so:libbcinfo.so:libc++.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libhidltransport.so:libhwbinder.so:libhwbinder_noltopgo.so:libion.so:liblzma.so:libunwindstack.so:libutils.so:libutilscallstack.so:libz.so - -############################################################################### -# "vndk" namespace -# -# This namespace is exclusively for vndk-sp libs. -############################################################################### -namespace.vndk.isolated = true -namespace.vndk.visible = true - -namespace.vndk.search.paths = /odm/${LIB}/vndk-sp -namespace.vndk.search.paths += /vendor/${LIB}/vndk-sp -namespace.vndk.search.paths += /system/${LIB}/vndk-sp-28 - -namespace.vndk.permitted.paths = /odm/${LIB}/hw -namespace.vndk.permitted.paths += /odm/${LIB}/egl -namespace.vndk.permitted.paths += /vendor/${LIB}/hw -namespace.vndk.permitted.paths += /vendor/${LIB}/egl -# This is exceptionally required since android.hidl.memory@1.0-impl.so is here -namespace.vndk.permitted.paths += /system/${LIB}/vndk-sp-28/hw - -namespace.vndk.asan.search.paths = /data/asan/odm/${LIB}/vndk-sp -namespace.vndk.asan.search.paths += /odm/${LIB}/vndk-sp -namespace.vndk.asan.search.paths += /data/asan/vendor/${LIB}/vndk-sp -namespace.vndk.asan.search.paths += /vendor/${LIB}/vndk-sp -namespace.vndk.asan.search.paths += /data/asan/system/${LIB}/vndk-sp-28 -namespace.vndk.asan.search.paths += /system/${LIB}/vndk-sp-28 - -namespace.vndk.asan.permitted.paths = /data/asan/odm/${LIB}/hw -namespace.vndk.asan.permitted.paths += /odm/${LIB}/hw -namespace.vndk.asan.permitted.paths += /data/asan/odm/${LIB}/egl -namespace.vndk.asan.permitted.paths += /odm/${LIB}/egl -namespace.vndk.asan.permitted.paths += /data/asan/vendor/${LIB}/hw -namespace.vndk.asan.permitted.paths += /vendor/${LIB}/hw -namespace.vndk.asan.permitted.paths += /data/asan/vendor/${LIB}/egl -namespace.vndk.asan.permitted.paths += /vendor/${LIB}/egl - -namespace.vndk.asan.permitted.paths += /data/asan/system/${LIB}/vndk-sp-28/hw -namespace.vndk.asan.permitted.paths += /system/${LIB}/vndk-sp-28/hw - -# The "vndk" namespace links to "default" namespace for LLNDK libs and links to -# "sphal" namespace for vendor libs. The ordering matters. The "default" -# namespace has higher priority than the "sphal" namespace. -namespace.vndk.links = default,sphal - -# When these NDK libs are required inside this namespace, then it is redirected -# to the default namespace. This is possible since their ABI is stable across -# Android releases. -namespace.vndk.link.default.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libc.so:libclang_rt.asan-aarch64-android.so:libclang_rt.asan-arm-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so -namespace.vndk.link.default.shared_libs += libclang_rt.asan-aarch64-android.so:libclang_rt.ubsan_standalone-aarch64-android.so:libclang_rt.tsan-aarch64-android.so:libclang_rt.asan-arm-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.tsan-arm-android.so - -# Allow VNDK-SP extensions to use vendor libraries -namespace.vndk.link.sphal.allow_all_shared_libs = true - -############################################################################### -# Namespace config for vendor processes. In O, no restriction is enforced for -# them. However, in O-MR1, access to /system/${LIB} will not be allowed to -# the default namespace. 'system' namespace will be added to give limited -# (LL-NDK only) access. -############################################################################### -[vendor] -additional.namespaces = system,vndk - -############################################################################### -# "default" namespace -# -# This is the default linker namespace for a vendor process (a process started -# from /vendor/bin/*). The main executable and the libs under /vendor/lib[64] -# are loaded directly into this namespace. However, other libs under the system -# partition (VNDK and LLNDK libraries) are not loaded here but from the -# separate namespace 'system'. The delegation to the system namespace is done -# via the 'namespace.default.link.system.shared_libs' property below. -############################################################################### -namespace.default.isolated = true -namespace.default.visible = true - -namespace.default.search.paths = /odm/${LIB} -namespace.default.search.paths += /vendor/${LIB} - -namespace.default.permitted.paths = /odm -namespace.default.permitted.paths += /vendor - -namespace.default.asan.search.paths = /data/asan/odm/${LIB} -namespace.default.asan.search.paths += /odm/${LIB} -namespace.default.asan.search.paths += /data/asan/vendor/${LIB} -namespace.default.asan.search.paths += /vendor/${LIB} - -namespace.default.asan.permitted.paths = /data/asan/odm -namespace.default.asan.permitted.paths += /odm -namespace.default.asan.permitted.paths += /data/asan/vendor -namespace.default.asan.permitted.paths += /vendor - -namespace.default.links = system,vndk -namespace.default.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libc.so:libclang_rt.asan-aarch64-android.so:libclang_rt.asan-arm-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so -namespace.default.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0.so:android.hidl.memory@1.0-impl.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbase.so:libbcinfo.so:libc++.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libhidltransport.so:libhwbinder.so:libhwbinder_noltopgo.so:libion.so:liblzma.so:libunwindstack.so:libutils.so:libutilscallstack.so:libz.so -namespace.default.link.vndk.shared_libs += android.frameworks.displayservice@1.0.so:android.frameworks.schedulerservice@1.0.so:android.frameworks.sensorservice@1.0.so:android.frameworks.vr.composer@1.0.so:android.hardware.audio.common-util.so:android.hardware.audio.common@2.0.so:android.hardware.audio.common@2.0-util.so:android.hardware.audio.common@4.0.so:android.hardware.audio.common@4.0-util.so:android.hardware.audio.effect@2.0.so:android.hardware.audio.effect@4.0.so:android.hardware.audio@2.0.so:android.hardware.audio@4.0.so:android.hardware.authsecret@1.0.so:android.hardware.automotive.audiocontrol@1.0.so:android.hardware.automotive.evs@1.0.so:android.hardware.automotive.vehicle@2.0.so:android.hardware.biometrics.fingerprint@2.1.so:android.hardware.bluetooth.a2dp@1.0.so:android.hardware.bluetooth@1.0.so:android.hardware.boot@1.0.so:android.hardware.broadcastradio@1.0.so:android.hardware.broadcastradio@1.1.so:android.hardware.broadcastradio@2.0.so:android.hardware.camera.common@1.0.so:android.hardware.camera.device@1.0.so:android.hardware.camera.device@3.2.so:android.hardware.camera.device@3.3.so:android.hardware.camera.device@3.4.so:android.hardware.camera.metadata@3.2.so:android.hardware.camera.metadata@3.3.so:android.hardware.camera.provider@2.4.so:android.hardware.cas.native@1.0.so:android.hardware.cas@1.0.so:android.hardware.configstore-utils.so:android.hardware.configstore@1.0.so:android.hardware.configstore@1.1.so:android.hardware.confirmationui-support-lib.so:android.hardware.confirmationui@1.0.so:android.hardware.contexthub@1.0.so:android.hardware.drm@1.0.so:android.hardware.drm@1.1.so:android.hardware.dumpstate@1.0.so:android.hardware.gatekeeper@1.0.so:android.hardware.gnss@1.0.so:android.hardware.gnss@1.1.so:android.hardware.graphics.allocator@2.0.so:android.hardware.graphics.bufferqueue@1.0.so:android.hardware.graphics.composer@2.1.so:android.hardware.graphics.composer@2.2.so:android.hardware.health@1.0.so:android.hardware.health@2.0.so:android.hardware.ir@1.0.so:android.hardware.keymaster@3.0.so:android.hardware.keymaster@4.0.so:android.hardware.light@2.0.so:android.hardware.media.bufferpool@1.0.so:android.hardware.media.omx@1.0.so:android.hardware.media@1.0.so:android.hardware.memtrack@1.0.so:android.hardware.neuralnetworks@1.0.so:android.hardware.neuralnetworks@1.1.so:android.hardware.nfc@1.0.so:android.hardware.nfc@1.1.so:android.hardware.oemlock@1.0.so:android.hardware.power@1.0.so:android.hardware.power@1.1.so:android.hardware.power@1.2.so:android.hardware.radio.config@1.0.so:android.hardware.radio.deprecated@1.0.so:android.hardware.radio@1.0.so:android.hardware.radio@1.1.so:android.hardware.radio@1.2.so:android.hardware.secure_element@1.0.so:android.hardware.sensors@1.0.so:android.hardware.soundtrigger@2.0.so:android.hardware.soundtrigger@2.0-core.so:android.hardware.soundtrigger@2.1.so:android.hardware.tetheroffload.config@1.0.so:android.hardware.tetheroffload.control@1.0.so:android.hardware.thermal@1.0.so:android.hardware.thermal@1.1.so:android.hardware.tv.cec@1.0.so:android.hardware.tv.input@1.0.so:android.hardware.usb.gadget@1.0.so:android.hardware.usb@1.0.so:android.hardware.usb@1.1.so:android.hardware.vibrator@1.0.so:android.hardware.vibrator@1.1.so:android.hardware.vibrator@1.2.so:android.hardware.vr@1.0.so:android.hardware.weaver@1.0.so:android.hardware.wifi.hostapd@1.0.so:android.hardware.wifi.offload@1.0.so:android.hardware.wifi.supplicant@1.0.so:android.hardware.wifi.supplicant@1.1.so:android.hardware.wifi@1.0.so:android.hardware.wifi@1.1.so:android.hardware.wifi@1.2.so:android.hidl.allocator@1.0.so:android.hidl.memory.block@1.0.so:android.hidl.token@1.0.so:android.hidl.token@1.0-utils.so:android.system.net.netd@1.0.so:android.system.net.netd@1.1.so:android.system.wifi.keystore@1.0.so:libadf.so:libaudioroute.so:libaudioutils.so:libbinder.so:libcamera_metadata.so:libcap.so:libclang_rt.ubsan_standalone-aarch64-android.so:libclang_rt.ubsan_standalone-arm-android.so:libcn-cbor.so:libcrypto.so:libcrypto_utils.so:libcurl.so:libdiskconfig.so:libdumpstateutil.so:libevent.so:libexif.so:libexpat.so:libfmq.so:libgatekeeper.so:libhardware_legacy.so:libhidlallocatorutils.so:libhidlcache.so:libjpeg.so:libkeymaster_messages.so:libkeymaster_portable.so:libldacBT_abr.so:libldacBT_enc.so:liblz4.so:libmedia_helper.so:libmedia_omx.so:libmemtrack.so:libminijail.so:libmkbootimg_abi_check.so:libnetutils.so:libnl.so:libopus.so:libpagemap.so:libpcre2.so:libpiex.so:libpng.so:libpower.so:libprocinfo.so:libprotobuf-cpp-full.so:libprotobuf-cpp-lite.so:libpuresoftkeymasterdevice.so:libradio_metadata.so:libselinux.so:libsoftkeymasterdevice.so:libspeexresampler.so:libsqlite.so:libssl.so:libstagefright_amrnb_common.so:libstagefright_bufferqueue_helper.so:libstagefright_enc_common.so:libstagefright_flacdec.so:libstagefright_foundation.so:libstagefright_omx.so:libstagefright_omx_utils.so:libstagefright_soft_aacdec.so:libstagefright_soft_aacenc.so:libstagefright_soft_amrdec.so:libstagefright_soft_amrnbenc.so:libstagefright_soft_amrwbenc.so:libstagefright_soft_avcdec.so:libstagefright_soft_avcenc.so:libstagefright_soft_flacdec.so:libstagefright_soft_flacenc.so:libstagefright_soft_g711dec.so:libstagefright_soft_gsmdec.so:libstagefright_soft_hevcdec.so:libstagefright_soft_mp3dec.so:libstagefright_soft_mpeg2dec.so:libstagefright_soft_mpeg4dec.so:libstagefright_soft_mpeg4enc.so:libstagefright_soft_opusdec.so:libstagefright_soft_rawdec.so:libstagefright_soft_vorbisdec.so:libstagefright_soft_vpxdec.so:libstagefright_soft_vpxenc.so:libstagefright_xmlparser.so:libsuspend.so:libsysutils.so:libtinyalsa.so:libtinyxml2.so:libui.so:libusbhost.so:libvixl-arm.so:libvixl-arm64.so:libvorbisidec.so:libwifi-system-iface.so:libxml2.so:libyuv.so:libziparchive.so - -############################################################################### -# "vndk" namespace -# -# This namespace is where VNDK and VNDK-SP libraries are loaded for -# a vendor process. -############################################################################### -namespace.vndk.isolated = false - -namespace.vndk.search.paths = /odm/${LIB}/vndk -namespace.vndk.search.paths += /odm/${LIB}/vndk-sp -namespace.vndk.search.paths += /vendor/${LIB}/vndk -namespace.vndk.search.paths += /vendor/${LIB}/vndk-sp -namespace.vndk.search.paths += /system/${LIB}/vndk-sp-28 -namespace.vndk.search.paths += /system/${LIB}/vndk-28 - -namespace.vndk.asan.search.paths = /data/asan/odm/${LIB}/vndk -namespace.vndk.asan.search.paths += /odm/${LIB}/vndk -namespace.vndk.asan.search.paths += /data/asan/odm/${LIB}/vndk-sp -namespace.vndk.asan.search.paths += /odm/${LIB}/vndk-sp -namespace.vndk.asan.search.paths += /data/asan/vendor/${LIB}/vndk -namespace.vndk.asan.search.paths += /vendor/${LIB}/vndk -namespace.vndk.asan.search.paths += /data/asan/vendor/${LIB}/vndk-sp -namespace.vndk.asan.search.paths += /vendor/${LIB}/vndk-sp -namespace.vndk.asan.search.paths += /data/asan/system/${LIB}/vndk-sp-28 -namespace.vndk.asan.search.paths += /system/${LIB}/vndk-sp-28 -namespace.vndk.asan.search.paths += /data/asan/system/${LIB}/vndk-28 -namespace.vndk.asan.search.paths += /system/${LIB}/vndk-28 - -# When these NDK libs are required inside this namespace, then it is redirected -# to the system namespace. This is possible since their ABI is stable across -# Android releases. -namespace.vndk.links = system,default -namespace.vndk.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libc.so:libclang_rt.asan-aarch64-android.so:libclang_rt.asan-arm-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so -namespace.vndk.link.system.shared_libs += libclang_rt.asan-aarch64-android.so:libclang_rt.ubsan_standalone-aarch64-android.so:libclang_rt.tsan-aarch64-android.so:libclang_rt.asan-arm-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.tsan-arm-android.so - -namespace.vndk.link.default.allow_all_shared_libs = true - -############################################################################### -# "system" namespace -# -# This namespace is where system libs (VNDK and LLNDK libs) are loaded for -# a vendor process. -############################################################################### -namespace.system.isolated = false - -namespace.system.search.paths = /system/${LIB} -namespace.system.search.paths += /system/product/${LIB} - -namespace.system.asan.search.paths = /data/asan/system/${LIB} -namespace.system.asan.search.paths += /system/${LIB} -namespace.system.asan.search.paths += /data/asan/product/${LIB} -namespace.system.asan.search.paths += /product/${LIB} - -############################################################################### -# Namespace config for binaries under /postinstall. -# Only one default namespace is defined and it has no directories other than -# /system/lib in the search paths. This is because linker calls realpath on the -# search paths and this causes selinux denial if the paths (/vendor, /odm) are -# not allowed to the poinstall binaries. There is no reason to allow the -# binaries to access the paths. -############################################################################### -[postinstall] -namespace.default.isolated = false -namespace.default.search.paths = /system/${LIB} -namespace.default.search.paths += /system/product/${LIB} diff --git a/recovery/root/sbin/libicuuc.so b/recovery/root/sbin/libicuuc.so deleted file mode 100755 index e823507..0000000 Binary files a/recovery/root/sbin/libicuuc.so and /dev/null differ diff --git a/recovery/root/sbin/libion.so b/recovery/root/sbin/libion.so deleted file mode 100755 index 2614e2e..0000000 Binary files a/recovery/root/sbin/libion.so and /dev/null differ diff --git a/recovery/root/sbin/libxml2.so b/recovery/root/sbin/libxml2.so deleted file mode 100755 index 24ff22f..0000000 Binary files a/recovery/root/sbin/libxml2.so and /dev/null differ diff --git a/recovery/root/sbin/prepdecrypt.sh b/recovery/root/sbin/prepdecrypt.sh deleted file mode 100644 index 709ea14..0000000 --- a/recovery/root/sbin/prepdecrypt.sh +++ /dev/null @@ -1,102 +0,0 @@ -#!/sbin/sh - -relink() -{ - fname=$(basename "$1") - target="/sbin/$fname" - sed 's|/system/bin/linker64|///////sbin/linker64|' "$1" > "$target" - chmod 755 $target -} - -finish() -{ - umount /v - umount /s - rmdir /v - rmdir /s - setprop crypto.ready 1 - exit 0 -} - -suffix=$(getprop ro.boot.slot_suffix) -if [ -z "$suffix" ]; then - suf=$(getprop ro.boot.slot) - suffix="_$suf" -fi -venpath="/dev/block/bootdevice/by-name/vendor$suffix" -mkdir /v -mount -t ext4 -o ro "$venpath" /v -syspath="/dev/block/bootdevice/by-name/system$suffix" -mkdir /s -mount -t ext4 -o ro "$syspath" /s - - -build_prop_path="/s/build.prop" -if [ -f /s/system/build.prop ]; then - build_prop_path="/s/system/build.prop" -fi - -vendor_prop_path="/v/build.prop" -if [ -f "$build_prop_path" ]; then - # TODO: It may be better to try to read these from the boot image than from /system - osver=$(grep -i 'ro.build.version.release' "$build_prop_path" | cut -f2 -d'=') - patchlevel=$(grep -i 'ro.build.version.security_patch' "$build_prop_path" | cut -f2 -d'=') - vendorlevel=$(grep -i 'ro.vendor.build.security_patch' "$vendor_prop_path" | cut -f2 -d'=') - setprop ro.build.version.release "$osver" - setprop ro.build.version.security_patch "$patchlevel" - setprop ro.vendor.build.security_patch "$vendorlevel" -else - # Be sure to increase the PLATFORM_VERSION in build/core/version_defaults.mk to override Google's anti-rollback features to something rather insane - osver=$(getprop ro.build.version.release_orig) - patchlevel=$(getprop ro.build.version.security_patch_orig) - setprop ro.build.version.release "$osver" - setprop ro.build.version.security_patch "$patchlevel" - setprop ro.vendor.build.security_patch "2018-11-05" -fi -finish - -mkdir -p /vendor/lib64/hw/ - -cp /s/system/lib64/android.hidl.base@1.0.so /sbin/ -cp /s/system/lib64/libion.so /sbin/ -cp /s/system/lib64/libicuuc.so /sbin/ -cp /s/system/lib64/libxml2.so /sbin/ - -relink /v/bin/qseecomd - -cp /v/lib64/libdiag.so /vendor/lib64/ -cp /v/lib64/libdrmfs.so /vendor/lib64/ -cp /v/lib64/libdrmtime.so /vendor/lib64/ -cp /v/lib64/libGPreqcancel.so /vendor/lib64/ -cp /v/lib64/libGPreqcancel_svc.so /vendor/lib64/ -cp /v/lib64/libqdutils.so /vendor/lib64/ -cp /v/lib64/libqisl.so /vendor/lib64/ -cp /v/lib64/libqservice.so /vendor/lib64/ -cp /v/lib64/libQSEEComAPI.so /vendor/lib64/ -cp /v/lib64/librecovery_updater_msm.so /vendor/lib64/ -cp /v/lib64/librpmb.so /vendor/lib64/ -cp /v/lib64/libsecureui.so /vendor/lib64/ -cp /v/lib64/libSecureUILib.so /vendor/lib64/ -cp /v/lib64/libsecureui_svcsock.so /vendor/lib64/ -cp /v/lib64/libspcom.so /vendor/lib64/ -cp /v/lib64/libspl.so /vendor/lib64/ -cp /v/lib64/libssd.so /vendor/lib64/ -cp /v/lib64/libStDrvInt.so /vendor/lib64/ -cp /v/lib64/libtime_genoff.so /vendor/lib64/ -cp /v/lib64/libkeymasterdeviceutils.so /vendor/lib64/ -cp /v/lib64/libkeymasterprovision.so /vendor/lib64/ -cp /v/lib64/libkeymasterutils.so /vendor/lib64/ -cp /v/lib64/libqtikeymaster4.so /vendor/lib64/ -cp /v/lib64/vendor.qti.hardware.tui_comm@1.0.so /vendor/lib64/ -cp /v/lib64/hw/bootctrl.msm8953.so /vendor/lib64/hw/ -cp /v/lib64/hw/android.hardware.boot@1.0-impl.so /vendor/lib64/hw/ -cp /v/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so /vendor/lib64/hw/ -#cp /v/lib64/hw/android.hardware.keymaster@3.0-impl-qti.so /vendor/lib64/hw/ - -cp /v/manifest.xml /vendor/ -cp /v/compatibility_matrix.xml /vendor/ - -relink /v/bin/hw/android.hardware.boot@1.0-service -relink /v/bin/hw/android.hardware.gatekeeper@1.0-service-qti -#relink /v/bin/hw/android.hardware.keymaster@3.0-service-qti -relink /v/bin/hw/android.hardware.keymaster@4.0-service-qti diff --git a/recovery/root/sbin/qseecomd b/recovery/root/sbin/qseecomd deleted file mode 100755 index 594f44a..0000000 Binary files a/recovery/root/sbin/qseecomd and /dev/null differ 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 new file mode 100644 index 0000000..bdc9a62 Binary files /dev/null and b/recovery/root/system/bin/android.hardware.gatekeeper@1.0-service-qti differ diff --git a/recovery/root/system/bin/android.hardware.keymaster@3.0-service-qti b/recovery/root/system/bin/android.hardware.keymaster@3.0-service-qti new file mode 100644 index 0000000..3741726 Binary files /dev/null and b/recovery/root/system/bin/android.hardware.keymaster@3.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 new file mode 100644 index 0000000..3af4206 Binary files /dev/null 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 new file mode 100644 index 0000000..71eb7b1 Binary files /dev/null and b/recovery/root/system/bin/qseecomd differ diff --git a/recovery/root/system/etc/recovery.fstab b/recovery/root/system/etc/recovery.fstab new file mode 100644 index 0000000..6775181 --- /dev/null +++ b/recovery/root/system/etc/recovery.fstab @@ -0,0 +1,48 @@ +# Copyright (c) 2018, 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: +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following +# disclaimer in the documentation and/or other materials provided +# with the distribution. +# * Neither the name of The Linux Foundation nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT +# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS +# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# Android fstab file. +# + +system /system ext4 ro,barrier=1 wait,slotselect,avb=vbmeta,logical,first_stage_mount +system_ext /system_ext ext4 ro,barrier=1 wait,slotselect,avb,logical,first_stage_mount +vendor /vendor ext4 ro,barrier=1 wait,slotselect,avb,logical,first_stage_mount +product /product ext4 ro,barrier=1 wait,slotselect,avb,logical,first_stage_mount +odm /odm ext4 ro,barrier=1 wait,slotselect,avb,logical,first_stage_mount + +/dev/block/bootdevice/by-name/userdata /data ext4 noatime,nosuid,nodev,barrier=1,noauto_da_alloc,discard latemount,wait,check,quota,reservedsize=128M,fileencryption=aes-256-xts:aes-256-cts +/dev/block/bootdevice/by-name/config /frp emmc defaults defaults +/dev/block/bootdevice/by-name/misc /misc emmc defaults defaults +/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,slotselect +/dev/block/bootdevice/by-name/dsp /vendor/dsp ext4 ro,nosuid,nodev,barrier=1 wait,slotselect +/dev/block/bootdevice/by-name/persist /mnt/vendor/persist ext4 noatime,nosuid,nodev,barrier=1 wait + +# +/devices/platform/soc/7864900.sdhci/mmc_host* /storage/sdcard1 vfat nosuid,nodev wait,voldmanaged=sdcard1:auto,noemulatedsd,encryptable=footer +/devices/platform/soc/7000000.ssusb/7000000.dwc3/xhci-hcd.0.auto* /storage/usbotg vfat nosuid,nodev wait,voldmanaged=usbotg:auto +/devices/soc/7864900.sdhci/mmc_host* /storage/sdcard1 vfat nosuid,nodev wait,voldmanaged=sdcard1:auto,noemulatedsd,encryptable=footer +/devices/soc/7000000.ssusb/7000000.dwc3/xhci-hcd.0.auto* /storage/usbotg vfat nosuid,nodev wait,voldmanaged=usbotg:auto diff --git a/recovery/root/etc/twrp.fstab b/recovery/root/system/etc/twrp.flags similarity index 72% rename from recovery/root/etc/twrp.fstab rename to recovery/root/system/etc/twrp.flags index 600f05f..e10c152 100644 --- a/recovery/root/etc/twrp.fstab +++ b/recovery/root/system/etc/twrp.flags @@ -2,22 +2,16 @@ /boot emmc /dev/block/bootdevice/by-name/boot flags=slotselect /dtbo emmc /dev/block/bootdevice/by-name/dtbo flags=slotselect;backup=1;flashimg;display="DTBO" /vbmeta emmc /dev/block/bootdevice/by-name/vbmeta flags=slotselect;backup=1 -/system_root ext4 /dev/block/bootdevice/by-name/system flags=fsflags=ro;slotselect;backup=0 -/system_image emmc /dev/block/bootdevice/by-name/system flags=slotselect -/vendor ext4 /dev/block/bootdevice/by-name/vendor flags=fsflags=ro;slotselect -/vendor_image emmc /dev/block/bootdevice/by-name/vendor flags=slotselect -/product ext4 /dev/block/bootdevice/by-name/product flags=fsflags=ro;slotselect;display="Product" -/product_image emmc /dev/block/bootdevice/by-name/product flags=slotselect;backup=1;display="Product Image" -/data ext4 /dev/block/bootdevice/by-name/userdata flags=fileencryption=aes-256-xts:aes-256-cts /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 /fsg emmc /dev/block/bootdevice/by-name/fsg flags=backup=1;subpartitionof=/efs1 /fsc emmc /dev/block/bootdevice/by-name/fsc flags=backup=1;subpartitionof=/efs1 /firmware emmc /dev/block/bootdevice/by-name/modem flags=slotselect;backup=1;display="Firmware" /dsp emmc /dev/block/bootdevice/by-name/dsp flags=slotselect;backup=1;subpartitionof=/firmware -/frp emmc /dev/block/bootdevice/by-name/config -/misc emmc /dev/block/bootdevice/by-name/misc -/persist ext4 /dev/block/bootdevice/by-name/persist + +/super_system emmc /dev/block/bootdevice/by-name/system flags=slotselect;backup=1;display="Super (system system_ext vendor product)" +/super_vendor emmc /dev/block/bootdevice/by-name/vendor flags=slotselect;backup=1;subpartitionof=/super_system +/super_product emmc /dev/block/bootdevice/by-name/product flags=slotselect;backup=1;subpartitionof=/super_system # Needed for flashing full stock images /aboot emmc /dev/block/bootdevice/by-name/aboot flags=slotselect diff --git a/recovery/root/etc/update_engine/update-payload-key.pub.pem b/recovery/root/system/etc/update_engine/update-payload-key.pub.pem similarity index 100% rename from recovery/root/etc/update_engine/update-payload-key.pub.pem rename to recovery/root/system/etc/update_engine/update-payload-key.pub.pem diff --git a/recovery/root/system/etc/vintf/manifest.xml b/recovery/root/system/etc/vintf/manifest.xml new file mode 100644 index 0000000..bb06379 --- /dev/null +++ b/recovery/root/system/etc/vintf/manifest.xml @@ -0,0 +1,116 @@ + + + + android.frameworks.displayservice + hwbinder + 1.0 + + IDisplayService + default + + @1.0::IDisplayService/default + + + android.frameworks.schedulerservice + hwbinder + 1.0 + + ISchedulingPolicyService + default + + @1.0::ISchedulingPolicyService/default + + + android.frameworks.sensorservice + hwbinder + 1.0 + + ISensorManager + default + + @1.0::ISensorManager/default + + + android.hidl.manager + hwbinder + 1.2 + + IServiceManager + default + + @1.2::IServiceManager/default + + + android.hidl.memory + passthrough + 1.0 + + IMapper + ashmem + + @1.0::IMapper/ashmem + + + android.hidl.token + hwbinder + 1.0 + + ITokenManager + default + + @1.0::ITokenManager/default + + + android.system.net.netd + hwbinder + 1.1 + + INetd + default + + @1.1::INetd/default + + + android.system.wifi.keystore + hwbinder + 1.0 + + IKeystore + default + + @1.0::IKeystore/default + + + netutils-wrapper + 1.0 + + + vendor.qti.hardware.radio.atcmdfwd + hwbinder + 1.0 + + IAtCmdFwd + AtCmdFwdService + + @1.0::IAtCmdFwd/AtCmdFwdService + + + vendor.qti.hardware.sigma_miracast + hwbinder + 1.0 + + Isigma_miracast + sigmahal + + @1.0::Isigma_miracast/sigmahal + + + 28 + 29 + 30 + + diff --git a/recovery/root/vendor/compatibility_matrix.xml b/recovery/root/vendor/etc/vintf/compatibility_matrix.xml similarity index 74% rename from recovery/root/vendor/compatibility_matrix.xml rename to recovery/root/vendor/etc/vintf/compatibility_matrix.xml index 410bc76..7ba6444 100644 --- a/recovery/root/vendor/compatibility_matrix.xml +++ b/recovery/root/vendor/etc/vintf/compatibility_matrix.xml @@ -1,4 +1,8 @@ - + + android.frameworks.schedulerservice 1.0 @@ -55,8 +59,24 @@ default + + vendor.qti.hardware.qccsyshal + 1.0 + + IQccsyshal + qccsyshal + + + + vendor.qti.hardware.sigma_miracast + 1.0 + + Isigma_miracast + sigmahal + + - 28 + 30 28 diff --git a/recovery/root/vendor/manifest.xml b/recovery/root/vendor/etc/vintf/manifest.xml similarity index 77% rename from recovery/root/vendor/manifest.xml rename to recovery/root/vendor/etc/vintf/manifest.xml index eb5fd85..12eaa75 100644 --- a/recovery/root/vendor/manifest.xml +++ b/recovery/root/vendor/etc/vintf/manifest.xml @@ -1,43 +1,47 @@ - + + android.hardware.audio hwbinder - 4.0 + 6.0 IDevicesFactory default - @4.0::IDevicesFactory/default + @6.0::IDevicesFactory/default android.hardware.audio.effect hwbinder - 4.0 + 6.0 IEffectsFactory default - @4.0::IEffectsFactory/default + @6.0::IEffectsFactory/default - android.hardware.biometrics.fingerprint + android.hardware.bluetooth hwbinder - 2.1 + 1.0 - IBiometricsFingerprint + IBluetoothHci default - @2.1::IBiometricsFingerprint/default + @1.0::IBluetoothHci/default - android.hardware.bluetooth + android.hardware.bluetooth.audio hwbinder - 1.0 + 2.0 - IBluetoothHci + IBluetoothAudioProvidersFactory default - @1.0::IBluetoothHci/default + @2.0::IBluetoothAudioProvidersFactory/default android.hardware.boot @@ -59,16 +63,6 @@ @2.4::ICameraProvider/legacy/0 - - android.hardware.cas - hwbinder - 1.0 - - IMediaCasService - default - - @1.0::IMediaCasService/default - android.hardware.configstore hwbinder @@ -79,25 +73,6 @@ @1.1::ISurfaceFlingerConfigs/default - - android.hardware.drm - hwbinder - 1.0 - - ICryptoFactory - default - - - IDrmFactory - default - - @1.0::ICryptoFactory/default - @1.0::IDrmFactory/default - @1.1::ICryptoFactory/clearkey - @1.1::ICryptoFactory/widevine - @1.1::IDrmFactory/clearkey - @1.1::IDrmFactory/widevine - android.hardware.gatekeeper hwbinder @@ -108,17 +83,6 @@ @1.0::IGatekeeper/default - - android.hardware.gnss - hwbinder - 1.0 - - IGnss - default - - @1.0::IGnss/default - @1.0::IGnss/gnss_vendor - android.hardware.graphics.allocator hwbinder @@ -142,12 +106,12 @@ android.hardware.graphics.mapper passthrough - 2.0 + 2.1 IMapper default - @2.0::IMapper/default + @2.1::IMapper/default android.hardware.health @@ -207,12 +171,12 @@ android.hardware.nfc hwbinder - 1.1 + 1.2 INfc default - @1.1::INfc/default + @1.2::INfc/default android.hardware.power @@ -227,31 +191,20 @@ android.hardware.radio hwbinder - 1.2 - - IRadio - slot1 - slot2 - - - ISap - slot1 - slot2 - - @1.2::IRadio/slot1 - @1.2::IRadio/slot2 @1.2::ISap/slot1 @1.2::ISap/slot2 + @1.4::IRadio/slot1 + @1.4::IRadio/slot2 android.hardware.radio.config hwbinder - 1.0 + 1.1 IRadioConfig default - @1.0::IRadioConfig/default + @1.1::IRadioConfig/default android.hardware.renderscript @@ -266,14 +219,14 @@ android.hardware.secure_element hwbinder - 1.0 + 1.2 ISecureElement SIM1 SIM2 - @1.0::ISecureElement/SIM1 - @1.0::ISecureElement/SIM2 + @1.2::ISecureElement/SIM1 + @1.2::ISecureElement/SIM2 android.hardware.sensors @@ -325,16 +278,6 @@ @1.0::IThermal/default - - android.hardware.usb - hwbinder - 1.0 - - IUsb - default - - @1.0::IUsb/default - android.hardware.vibrator hwbinder @@ -345,36 +288,6 @@ @1.0::IVibrator/default - - android.hardware.wifi - hwbinder - 1.2 - - IWifi - default - - @1.2::IWifi/default - - - android.hardware.wifi.hostapd - hwbinder - 1.0 - - IHostapd - default - - @1.0::IHostapd/default - - - android.hardware.wifi.supplicant - hwbinder - 1.1 - - ISupplicant - default - - @1.1::ISupplicant/default - com.qualcomm.qti.dpm.api hwbinder @@ -388,22 +301,22 @@ com.qualcomm.qti.imscmservice hwbinder - 2.1 + 2.2 IImsCmService qti.ims.connectionmanagerservice - @2.1::IImsCmService/qti.ims.connectionmanagerservice + @2.2::IImsCmService/qti.ims.connectionmanagerservice com.qualcomm.qti.uceservice hwbinder - 2.0 + 2.3 IUceService com.qualcomm.qti.uceservice - @2.0::IUceService/com.qualcomm.qti.uceservice + @2.3::IUceService/com.qualcomm.qti.uceservice com.qualcomm.qti.wifidisplayhal @@ -433,12 +346,12 @@ vendor.display.config hwbinder - 1.1 + 2.0 IDisplayConfig default - @1.1::IDisplayConfig/default + @2.0::IDisplayConfig/default vendor.display.postproc @@ -451,106 +364,126 @@ @1.0::IDisplayPostproc/default - vendor.nxp.hardware.nfc + vendor.qti.data.factory + hwbinder + 2.3 + + IFactory + default + + @2.3::IFactory/default + + + vendor.qti.esepowermanager + hwbinder + 1.1 + + IEsePowerManager + default + + @1.1::IEsePowerManager/default + + + vendor.qti.hardware.alarm hwbinder 1.0 - INqNfc + IAlarm default - @1.0::INqNfc/default + @1.0::IAlarm/default - vendor.qti.data.factory + vendor.qti.hardware.bluetooth_sar hwbinder 1.1 - IFactory + IBluetoothSar default - @1.1::IFactory/default + @1.1::IBluetoothSar/default - vendor.qti.esepowermanager + vendor.qti.hardware.cacert hwbinder 1.0 - IEsePowerManager + IService default - @1.0::IEsePowerManager/default + @1.0::IService/default - vendor.qti.gnss + vendor.qti.hardware.capabilityconfigstore hwbinder 1.0 - ILocHidlGnss - gnss_vendor + ICapabilityConfigStore + default - @1.0::ILocHidlGnss/gnss_vendor + @1.0::ICapabilityConfigStore/default - vendor.qti.hardware.alarm + vendor.qti.hardware.cryptfshw hwbinder 1.0 - IAlarm + ICryptfsHw default - @1.0::IAlarm/default + @1.0::ICryptfsHw/default vendor.qti.hardware.data.connection hwbinder - 1.0 + 1.1 IDataConnection slot1 slot2 - @1.0::IDataConnection/slot1 - @1.0::IDataConnection/slot2 + @1.1::IDataConnection/slot1 + @1.1::IDataConnection/slot2 - vendor.qti.hardware.data.latency + vendor.qti.hardware.dsp hwbinder 1.0 - ILinkLatency - default + IDspService + dspservice - @1.0::ILinkLatency/default + @1.0::IDspService/dspservice - vendor.qti.hardware.factory + vendor.qti.hardware.fstman hwbinder 1.0 - IFactory + IFstManager default - @1.0::IFactory/default + @1.0::IFstManager/default vendor.qti.hardware.perf hwbinder - 1.0 + 2.2 IPerf default - @1.0::IPerf/default + @2.2::IPerf/default - vendor.qti.hardware.qdutils_disp + vendor.qti.hardware.qseecom hwbinder 1.0 - IQdutilsDisp + IQSEECom default - @1.0::IQdutilsDisp/default + @1.0::IQSEECom/default vendor.qti.hardware.qteeconnector @@ -582,26 +515,26 @@ vendor.qti.hardware.radio.ims hwbinder - 1.4 + 1.7 IImsRadio imsradio0 imsradio1 - @1.4::IImsRadio/imsradio0 - @1.4::IImsRadio/imsradio1 + @1.7::IImsRadio/imsradio0 + @1.7::IImsRadio/imsradio1 vendor.qti.hardware.radio.lpa hwbinder - 1.0 + 1.1 IUimLpa UimLpa0 UimLpa1 - @1.0::IUimLpa/UimLpa0 - @1.0::IUimLpa/UimLpa1 + @1.1::IUimLpa/UimLpa0 + @1.1::IUimLpa/UimLpa1 vendor.qti.hardware.radio.qcrilhook @@ -630,26 +563,26 @@ vendor.qti.hardware.radio.qtiradio hwbinder - 2.3 + 2.4 IQtiRadio slot1 slot2 - @2.3::IQtiRadio/slot1 - @2.3::IQtiRadio/slot2 + @2.4::IQtiRadio/slot1 + @2.4::IQtiRadio/slot2 vendor.qti.hardware.radio.uim hwbinder - 1.1 + 1.2 IUim Uim0 Uim1 - @1.1::IUim/Uim0 - @1.1::IUim/Uim1 + @1.2::IUim/Uim0 + @1.2::IUim/Uim1 vendor.qti.hardware.radio.uim_remote_client @@ -695,26 +628,6 @@ @1.0::ITuiComm/default - - vendor.qti.hardware.wifi.hostapd - hwbinder - 1.0 - - IHostapdVendor - default - - @1.0::IHostapdVendor/default - - - vendor.qti.hardware.wifi.supplicant - hwbinder - 2.0 - - ISupplicantVendor - default - - @2.0::ISupplicantVendor/default - vendor.qti.hardware.wigig.netperftuner hwbinder @@ -745,17 +658,27 @@ @1.0::IService/default + + vendor.qti.ims.factory + hwbinder + 1.1 + + IImsFactory + default + + @1.1::IImsFactory/default + vendor.qti.imsrtpservice hwbinder - 1.0 + 3.0 IRTPService imsrtpservice - @1.0::IRTPService/imsrtpservice + @3.0::IRTPService/imsrtpservice - 28.0 + 30.0 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 deleted file mode 100644 index c800486..0000000 Binary files a/recovery/root/vendor/lib64/hw/android.hardware.boot@1.0-impl.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 b1a9701..0bf8888 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/hw/bootctrl.msm8953.so b/recovery/root/vendor/lib64/hw/bootctrl.msm8953.so deleted file mode 100644 index 26d7a97..0000000 Binary files a/recovery/root/vendor/lib64/hw/bootctrl.msm8953.so and /dev/null differ diff --git a/recovery/root/vendor/lib64/libGPreqcancel.so b/recovery/root/vendor/lib64/libGPreqcancel.so deleted file mode 100644 index 3e61f11..0000000 Binary files a/recovery/root/vendor/lib64/libGPreqcancel.so and /dev/null differ diff --git a/recovery/root/vendor/lib64/libGPreqcancel_svc.so b/recovery/root/vendor/lib64/libGPreqcancel_svc.so deleted file mode 100644 index d1b3fa2..0000000 Binary files a/recovery/root/vendor/lib64/libGPreqcancel_svc.so and /dev/null differ diff --git a/recovery/root/vendor/lib64/libQSEEComAPI.so b/recovery/root/vendor/lib64/libQSEEComAPI.so index 250a702..2719ba8 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 deleted file mode 100644 index 8e35091..0000000 Binary files a/recovery/root/vendor/lib64/libSecureUILib.so and /dev/null differ diff --git a/recovery/root/vendor/lib64/libStDrvInt.so b/recovery/root/vendor/lib64/libStDrvInt.so deleted file mode 100644 index 1fc44ef..0000000 Binary files a/recovery/root/vendor/lib64/libStDrvInt.so and /dev/null differ diff --git a/recovery/root/vendor/lib64/libandroidicu.so b/recovery/root/vendor/lib64/libandroidicu.so new file mode 100644 index 0000000..1e6b81a Binary files /dev/null and b/recovery/root/vendor/lib64/libandroidicu.so differ diff --git a/recovery/root/vendor/lib64/libdiag.so b/recovery/root/vendor/lib64/libdiag.so index 959fa40..4556aa6 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/libdrmfs.so b/recovery/root/vendor/lib64/libdrmfs.so index 527c992..6cbce84 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 deleted file mode 100644 index 805fc5e..0000000 Binary files a/recovery/root/vendor/lib64/libdrmtime.so and /dev/null differ diff --git a/recovery/root/vendor/lib64/libicui18n.so b/recovery/root/vendor/lib64/libicui18n.so new file mode 100644 index 0000000..5ac310c Binary files /dev/null and b/recovery/root/vendor/lib64/libicui18n.so differ diff --git a/recovery/root/vendor/lib64/libicuuc.so b/recovery/root/vendor/lib64/libicuuc.so new file mode 100644 index 0000000..580b8d0 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 f7f6c02..4b9ea8a 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 deleted file mode 100644 index 3f03094..0000000 Binary files a/recovery/root/vendor/lib64/libkeymasterprovision.so and /dev/null differ diff --git a/recovery/root/vendor/lib64/libkeymasterutils.so b/recovery/root/vendor/lib64/libkeymasterutils.so index f49b5d5..fd1216d 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/libqcbor.so b/recovery/root/vendor/lib64/libqcbor.so new file mode 100644 index 0000000..ff28879 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 deleted file mode 100644 index 5302261..0000000 Binary files a/recovery/root/vendor/lib64/libqdutils.so and /dev/null differ diff --git a/recovery/root/vendor/lib64/libqisl.so b/recovery/root/vendor/lib64/libqisl.so deleted file mode 100644 index 8281743..0000000 Binary files a/recovery/root/vendor/lib64/libqisl.so and /dev/null differ diff --git a/recovery/root/vendor/lib64/libqservice.so b/recovery/root/vendor/lib64/libqservice.so deleted file mode 100644 index 9679800..0000000 Binary files a/recovery/root/vendor/lib64/libqservice.so and /dev/null differ diff --git a/recovery/root/vendor/lib64/libqtikeymaster4.so b/recovery/root/vendor/lib64/libqtikeymaster4.so index b766ec3..0153c6a 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 deleted file mode 100644 index c93c218..0000000 Binary files a/recovery/root/vendor/lib64/librecovery_updater_msm.so and /dev/null differ diff --git a/recovery/root/vendor/lib64/librpmb.so b/recovery/root/vendor/lib64/librpmb.so index 4a5628d..eb8661d 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 deleted file mode 100644 index 984fd3e..0000000 Binary files a/recovery/root/vendor/lib64/libsecureui.so and /dev/null differ diff --git a/recovery/root/vendor/lib64/libsecureui_svcsock.so b/recovery/root/vendor/lib64/libsecureui_svcsock.so deleted file mode 100644 index 3838fee..0000000 Binary files a/recovery/root/vendor/lib64/libsecureui_svcsock.so and /dev/null differ diff --git a/recovery/root/vendor/lib64/libssd.so b/recovery/root/vendor/lib64/libssd.so index f16ecb5..751ea18 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 deleted file mode 100644 index ba900f1..0000000 Binary files a/recovery/root/vendor/lib64/libtime_genoff.so and /dev/null 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 deleted file mode 100644 index 683fab4..0000000 Binary files a/recovery/root/vendor/lib64/vendor.qti.hardware.tui_comm@1.0.so and /dev/null differ diff --git a/omni.dependencies b/twrp.dependencies similarity index 100% rename from omni.dependencies rename to twrp.dependencies diff --git a/omni_FP3.mk b/twrp_FP3.mk similarity index 80% rename from omni_FP3.mk rename to twrp_FP3.mk index 8b0cb58..8162d5c 100644 --- a/omni_FP3.mk +++ b/twrp_FP3.mk @@ -18,7 +18,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) # Inherit from our custom product configuration -$(call inherit-product, vendor/omni/config/common.mk) +$(call inherit-product, vendor/twrp/config/common.mk) # A/B updater AB_OTA_UPDATER := true @@ -62,13 +62,19 @@ PRODUCT_PACKAGES_DEBUG += \ # Boot control HAL PRODUCT_PACKAGES += \ - bootctrl.msm8953 - -PRODUCT_STATIC_BOOT_CONTROL_HAL := \ bootctrl.msm8953 \ - libcutils \ - libgptutils \ - libz + bootctrl.msm8953.recovery + +# Crypto +PRODUCT_PACKAGES += \ + qcom_decrypt \ + qcom_decrypt_fbe + +#PRODUCT_STATIC_BOOT_CONTROL_HAL := \ +# bootctrl.msm8953 \ +# libcutils \ +# libgptutils \ +# libz # Time Zone data for recovery PRODUCT_COPY_FILES += \ @@ -78,17 +84,23 @@ PRODUCT_COPY_FILES += \ PRODUCT_PROPERTY_OVERRIDES += \ ro.hardware.keystore=msm8953 \ ro.hardware.gatekeeper=msm8953 \ - ro.hardware.bootctrl=msm8953 \ - ro.build.system_root_image=true + ro.hardware.bootctrl=msm8953 # Properties for Adoptable Storage PRODUCT_PROPERTY_OVERRIDES += \ ro.crypto.allow_encrypt_override=true \ ro.crypto.volume.filenames_mode=aes-256-cts +# For verification of stock images +PRODUCT_EXTRA_RECOVERY_KEYS := device/fairphone/FP3/releasekey + +# Dynamic partitions +PRODUCT_USE_DYNAMIC_PARTITIONS := true +PRODUCT_RETROFIT_DYNAMIC_PARTITIONS := true + # Device identifier. This must come after all inclusions PRODUCT_DEVICE := FP3 -PRODUCT_NAME := omni_FP3 +PRODUCT_NAME := twrp_FP3 PRODUCT_BRAND := Fairphone PRODUCT_MODEL := FP3 PRODUCT_MANUFACTURER := Fairphone