zenfone8: Change to 30.11.51.44 vendor
Change-Id: I548d41ce3a12c9e2046ec9c4f68f8cac8bcaa96d
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 21c1acc..d107ad5 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -111,7 +111,7 @@
# Kernel
BOARD_BOOT_HEADER_VERSION := 3
BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION)
-BOARD_KERNEL_CMDLINE := console=ttyMSM0,115200n8 androidboot.hardware=qcom androidboot.console=ttyMSM0 androidboot.memcg=1 lpm_levels.sleep_disabled=1 video=vfb:640x400,bpp=32,memsize=3072000 msm_rtb.filter=0x237 service_locator.enable=1 androidboot.usbcontroller=a600000.dwc3 swiotlb=0 loop.max_part=7 cgroup.memory=nokmem,nosocket pcie_ports=compat loop.max_part=7 iptable_raw.raw_before_defrag=1 ip6table_raw.raw_before_defrag=1
+BOARD_KERNEL_CMDLINE := console=ttyMSM0,115200n8 androidboot.hardware=qcom androidboot.console=ttyMSM0 androidboot.memcg=1 lpm_levels.sleep_disabled=1 video=vfb:640x400,bpp=32,memsize=3072000 msm_rtb.filter=0x237 service_locator.enable=1 androidboot.usbcontroller=a600000.dwc3 swiotlb=0 firmware_class.path=/vendor/firmware loop.max_part=7 cgroup.memory=nokmem,nosocket pcie_ports=compat loop.max_part=7 iptable_raw.raw_before_defrag=1 ip6table_raw.raw_before_defrag=1
#BOARD_KERNEL_CMDLINE += androidboot.selinux=permissive
BOARD_KERNEL_PAGESIZE := 4096
BOARD_KERNEL_BASE := 0x00000000
@@ -175,8 +175,10 @@
# Recovery
BOARD_USES_RECOVERY_AS_BOOT := true
TARGET_NO_RECOVERY := true
+TARGET_USERIMAGES_USE_EXT4 := true
+TARGET_USERIMAGES_USE_F2FS := true
TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/recovery.fstab
-TARGET_RECOVERY_PIXEL_FORMAT := "BGRA_8888"
+TARGET_RECOVERY_PIXEL_FORMAT := "RGBX_8888"
BOARD_AVB_RECOVERY_KEY_PATH := external/avb/test/data/testkey_rsa4096.pem
BOARD_AVB_RECOVERY_ALGORITHM := SHA256_RSA4096
BOARD_AVB_RECOVERY_ROLLBACK_INDEX := 1
diff --git a/extract-files.sh b/extract-files.sh
index bb3ea0b..5096b88 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -56,6 +56,16 @@
SRC=adb
fi
+function blob_fixup() {
+ case "${1}" in
+ # Fix xml version
+ system_ext/etc/permissions/vendor.qti.hardware.data.connection-V1.0-java.xml | system_ext/etc/permissions/vendor.qti.hardware.data.connection-V1.1-java.xml)
+ sed -i 's|product|system_ext|g' "${2}"
+ sed -i 's|xml version="2.0"|xml version="1.0"|g' "${2}"
+ ;;
+ esac
+}
+
# Initialize the helper
setup_vendor "$DEVICE" "$VENDOR" "$CM_ROOT" false "$CLEAN_VENDOR"
diff --git a/omni_zenfone8.mk b/omni_zenfone8.mk
index 519337c..6c8f034 100644
--- a/omni_zenfone8.mk
+++ b/omni_zenfone8.mk
@@ -42,24 +42,23 @@
PRODUCT_DEVICE := zenfone8
PRODUCT_NAME := omni_zenfone8
PRODUCT_BRAND := asus
-PRODUCT_MODEL := ASUS_I01WD
+PRODUCT_MODEL := ASUS_I006D
PRODUCT_MANUFACTURER := asus
-TARGET_DEVICE := WW_I01WD
-PRODUCT_SYSTEM_DEVICE := ASUS_I01WD
-PRODUCT_SYSTEM_NAME := WW_I01WD
+TARGET_DEVICE := WW_I006D
+PRODUCT_SYSTEM_DEVICE := ASUS_I006D
+PRODUCT_SYSTEM_NAME := WW_I006D
OMNI_PRODUCT_PROPERTIES += \
- ro.build.product=ZS630KL
+ ro.build.product=ZS590KS
PRODUCT_BUILD_PROP_OVERRIDES += \
- PRODUCT_DEVICE=ASUS_I01WD \
- PRODUCT_NAME=WW_I01WD \
- TARGET_DEVICE=ZS630KL
+ PRODUCT_DEVICE=ASUS_I006D \
+ PRODUCT_NAME=WW_I006D \
+ TARGET_DEVICE=ZS590KS
-VENDOR_RELEASE := 11/RKQ1.200710.002/18.0610.2103.137-0:user/release-keys
-BUILD_FINGERPRINT := asus/WW_I01WD/ASUS_I01WD:$(VENDOR_RELEASE)
-OMNI_BUILD_FINGERPRINT := asus/WW_I01WD/ASUS_I01WD:$(VENDOR_RELEASE)
-OMNI_PRIVATE_BUILD_DESC := "'RKQ1.200710.002.WW_Phone-18.0610.2103.137-0'"
+VENDOR_RELEASE := 11/RKQ1.201022.002/30.11.51.44:user/release-keys
+BUILD_FINGERPRINT := asus/WW_I006D/ASUS_I006D:$(VENDOR_RELEASE)
+OMNI_BUILD_FINGERPRINT := asus/WW_I006D/ASUS_I006D:$(VENDOR_RELEASE)
-PLATFORM_SECURITY_PATCH_OVERRIDE := 2021-03-01
\ No newline at end of file
+PLATFORM_SECURITY_PATCH_OVERRIDE := 2021-04-05
diff --git a/proprietary-files-product.txt b/proprietary-files-product.txt
index b9667a7..70bc905 100644
--- a/proprietary-files-product.txt
+++ b/proprietary-files-product.txt
@@ -6,22 +6,12 @@
# Bluetooth
system_ext/lib64/vendor.qti.hardware.audiohalext@1.0.so
-# Device
--system_ext/app/DeviceInfo/DeviceInfo.apk
--system_ext/app/DeviceStatisticsService/DeviceStatisticsService.apk
-
-# Display api
-product/etc/permissions/com.qti.snapdragon.sdk.display.xml
--product/framework/com.qti.snapdragon.sdk.display.jar
--system_ext/app/colorservice/colorservice.apk
-system_ext/lib64/libsdm-disp-apis.qti.so
-system_ext/lib64/libsd_sdk_display.qti.so
-system_ext/lib64/vendor.display.color@1.0.so
-system_ext/lib64/vendor.display.color@1.1.so
-system_ext/lib64/vendor.display.color@1.2.so
-system_ext/lib64/vendor.display.color@1.3.so
-system_ext/lib64/vendor.display.postproc@1.0.so
-system_ext/lib64/vendor.qti.hardware.qdutils_disp@1.0.so
+# Camera
+system_ext/lib64/libQSEEComAPI_system.so
+system_ext/lib64/vendor.qti.hardware.scve.objecttracker@1.0-adapter-helper.so
+system_ext/lib64/vendor.qti.hardware.scve.objecttracker@1.0.so
+system_ext/lib64/vendor.qti.hardware.scve.panorama@1.0-adapter-helper.so
+system_ext/lib64/vendor.qti.hardware.scve.panorama@1.0.so
# QTI Telephony
-system_ext/app/datastatusnotification/datastatusnotification.apk
@@ -34,8 +24,10 @@
-system_ext/framework/embmslibrary.jar
-system_ext/framework/uimgbalibrary.jar
-system_ext/framework/uimgbamanagerlibrary.jar
-# https://git.rip/dumps/redmi/curtana/-/blob/qssi-user-11-RKQ1.200826.002-V12.0.1.0.RJWINXM-release-keys/system_ext/framework/qti-telephony-common.jar
--system_ext/framework/qti-telephony-common.jar|C4D8A8B797EBCC7C73384CE3A10BA9E94FB1B460
+# ROG 5
+-system_ext/framework/qti-telephony-common.jar|07B2B91F5D547C5B5E0752F0F5534321BC93A2C1
+product/etc/permissions/vendor.qti.hardware.data.connection-V1.0-java.xml:system_ext/etc/permissions/vendor.qti.hardware.data.connection-V1.0-java.xml
+product/etc/permissions/vendor.qti.hardware.data.connection-V1.1-java.xml:system_ext/etc/permissions/vendor.qti.hardware.data.connection-V1.1-java.xml
-system_ext/framework/vendor.qti.hardware.data.connection-V1.0-java.jar
-system_ext/framework/vendor.qti.hardware.data.connection-V1.1-java.jar
-system_ext/framework/vendor.qti.hardware.data.dynamicdds-V1.0-java.jar
@@ -141,14 +133,6 @@
system_ext/lib64/libcryptfs_hw.so
# System Helper
--system_ext/app/com.qualcomm.qti.services.systemhelper/com.qualcomm.qti.services.systemhelper.apk
system_ext/lib64/vendor.qti.hardware.embmssl@1.0.so
system_ext/lib64/vendor.qti.hardware.embmssl@1.0-adapter-helper.so
system_ext/lib64/libsystemhelper_jni.so
-
-# Wigig
--system_ext/framework/vendor.qti.hardware.wigig.netperftuner-V1.0-java.jar
--system_ext/framework/vendor.qti.hardware.wigig.supptunnel-V1.0-java.jar
--system_ext/framework/wigig-service.jar
-system_ext/lib64/vendor.qti.hardware.wigig.netperftuner@1.0.so
-system_ext/lib64/vendor.qti.hardware.wigig.supptunnel@1.0.so
diff --git a/proprietary-files.txt b/proprietary-files.txt
index c21cc5f..91e69ec 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -15,30 +15,18 @@
-system_ext/framework/audiosphere.jar
# Camera
-lib/DataSet/ispDB/ASUS_UNDI.bin
-lib/DataSet/ispDB/ASUS_UNDI_ZOOM.bin
-lib/DataSet/ispDB/ParameterDB.db
--priv-app/AsusCamera/AsusCamera.apk
-priv-app/AsusCamera/lib/arm64/libarcsoft_distortion_correction.so
-priv-app/AsusCamera/lib/arm64/libarcsoft_object_tracking.so
-priv-app/AsusCamera/lib/arm64/libarcsoft_panorama_burstcapture.so
-priv-app/AsusCamera/lib/arm64/libasusundistort.so
-priv-app/AsusCamera/lib/arm64/libasus_camera_object_tracking.so
-priv-app/AsusCamera/lib/arm64/libasus_camera_panorama.so
-priv-app/AsusCamera/lib/arm64/libasus_camera_selfiepano.so
-priv-app/AsusCamera/lib/arm64/libbitmap.so
-priv-app/AsusCamera/lib/arm64/libmpbase.so
-priv-app/AsusCamera/lib/arm64/libtensorflowlite_jni.so
-priv-app/AsusCamera/lib/arm64/libUndistort.so
-priv-app/AsusCamera/lib/arm64/libyuv_util.so
--priv-app/MotorService/MotorService.apk
-priv-app/MotorService/lib/arm64/libAsusLaserSensorHAL.so
-priv-app/MotorService/lib/arm64/libAsusMotorDriverHAL.so
-priv-app/MotorService/lib/arm64/libjni_laser.so
-priv-app/MotorService/lib/arm64/libjni_motor.so
--priv-app/MotorK/MotorK.apk
+lib64/DataSet/arch/DIT_List.cfg
+lib64/DataSet/ditSCidGen/msgchk.db
+lib64/DataSet/ispDB/ParameterDB.db
+lib64/libxditk_DIT_Manager.so
+lib64/libxditk_ISP.so
+lib64/libxditk_arch.so
+lib64/libxditk_ditArchLIB.so
+lib64/libxditk_ditBSP.so
+lib64/libxditk_ditBSP_JNI.so
# CNE
+-system_ext/framework/com.quicinc.cne.api-V1.0-java.jar
-system_ext/framework/com.quicinc.cne.api-V1.1-java.jar
-system_ext/framework/com.quicinc.cne.constants-V1.0-java.jar
-system_ext/framework/com.quicinc.cne.constants-V2.0-java.jar
@@ -54,6 +42,23 @@
system_ext/lib64/vendor.qti.hardware.data.cne.internal.constants@1.0.so
system_ext/lib64/vendor.qti.hardware.data.cne.internal.server@1.0.so
+# Device
+-system_ext/app/DeviceInfo/DeviceInfo.apk
+-system_ext/app/DeviceStatisticsService/DeviceStatisticsService.apk
+
+# Display
+product/etc/permissions/com.qti.snapdragon.sdk.display.xml
+-product/framework/com.qti.snapdragon.sdk.display.jar
+-system_ext/app/colorservice/colorservice.apk
+system_ext/lib64/libsdm-disp-apis.qti.so
+system_ext/lib64/libsd_sdk_display.qti.so
+system_ext/lib64/vendor.display.color@1.0.so
+system_ext/lib64/vendor.display.color@1.1.so
+system_ext/lib64/vendor.display.color@1.2.so
+system_ext/lib64/vendor.display.color@1.3.so
+system_ext/lib64/vendor.display.postproc@1.0.so
+system_ext/lib64/vendor.qti.hardware.qdutils_disp@1.0.so
+
# DPM
-framework/tcmclient.jar
system_ext/bin/dpmd
@@ -75,48 +80,6 @@
system_ext/lib64/libfm-hci.so
system_ext/lib64/vendor.qti.hardware.fm@1.0.so
-# Gallery
--priv-app/AsusGallery/AsusGallery.apk
-priv-app/AsusGallery/lib/arm64/libarcsoft_beautyshot.so
-priv-app/AsusGallery/lib/arm64/libarcsoft_undistort.so
-priv-app/AsusGallery/lib/arm64/libblur.so
-priv-app/AsusGallery/lib/arm64/libcvface_api.so
-priv-app/AsusGallery/lib/arm64/libgif.so
-priv-app/AsusGallery/lib/arm64/libgvr.so
-priv-app/AsusGallery/lib/arm64/libjni_cvface_api.so
-priv-app/AsusGallery/lib/arm64/libjni_face_effect.so
-priv-app/AsusGallery/lib/arm64/libjni_filter_show.so
-priv-app/AsusGallery/lib/arm64/libjni_wide_angle_undistort.so
-priv-app/AsusGallery/lib/arm64/libmpbase.so
-priv-app/AsusGallery/lib/arm64/libNvStreamingSdkCore.so
-priv-app/AsusGallery/lib/arm64/libopencv_java3.so
-priv-app/AsusGallery/lib/arm64/libpanorenderer.so
-priv-app/AsusGallery/lib/arm64/libpano_video_renderer.so
-priv-app/AsusGallery/lib/arm64/librs.blur.so
-priv-app/AsusGallery/lib/arm64/librs.convolve3x3.so
-priv-app/AsusGallery/lib/arm64/librs.grad.so
-priv-app/AsusGallery/lib/arm64/librs.grey.so
-priv-app/AsusGallery/lib/arm64/librs.saturation.so
-priv-app/AsusGallery/lib/arm64/librs.vignette.so
-priv-app/AsusGallery/lib/arm64/librsjni.so
-priv-app/AsusGallery/lib/arm64/librsjni_androidx.so
-priv-app/AsusGallery/lib/arm64/libRSSupport.so
-priv-app/AsusGallery/lib/arm64/libtensorflowlite_jni.so
-priv-app/AsusGallery/lib/arm64/libtensorflow_inference.so
-
-# GalleryBurst
--priv-app/AsusGalleryBurst/AsusGalleryBurst.apk
-priv-app/AsusGalleryBurst/lib/arm/libgifencoder.so
-
-# GalleryBurst Video Editor
-etc/videoeditor/Soothing.mfim
-etc/videoeditor/Charming.mfim
-etc/videoeditor/Energetic.mfim
-etc/videoeditor/Lively.mfim
-etc/videoeditor/Graceful.mfim
-etc/videoeditor/Happy.mfim
-etc/videoeditor/Dynamic.mfim
-
# GPS
system_ext/etc/permissions/com.qti.location.sdk.xml
system_ext/etc/permissions/com.qualcomm.location.xml
@@ -135,8 +98,8 @@
system_ext/lib64/vendor.qti.gnss@4.0.so
# HotwordEnrollment
--product/priv-app/HotwordEnrollmentOKGoogleWCD9340/HotwordEnrollmentOKGoogleWCD9340.apk;PRESIGNED
--product/priv-app/HotwordEnrollmentXGoogleWCD9340/HotwordEnrollmentXGoogleWCD9340.apk;PRESIGNED
+-product/priv-app/HotwordEnrollmentOKGoogleHEXAGON/HotwordEnrollmentOKGoogleHEXAGON.apk;PRESIGNED
+-product/priv-app/HotwordEnrollmentXGoogleHEXAGON/HotwordEnrollmentXGoogleHEXAGON.apk;PRESIGNED
system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml
-system_ext/framework/com.android.hotwordenrollment.common.util.jar
@@ -149,6 +112,10 @@
system_ext/lib/vendor.qti.hardware.sigma_miracast@1.0.so
system_ext/lib64/vendor.qti.hardware.sigma_miracast@1.0.so
+# Power
+-framework/QPerformance.jar
+-framework/UxPerformance.jar
+
# QVR
system_ext/bin/qvrservice
system_ext/etc/init/qvrd_ext.rc
@@ -175,9 +142,12 @@
system_ext/lib/rfsa/adsp/libqvr_dsp_driver_skel.so
system_ext/lib/rfsa/adsp/libtracker_6dof_skel_8150.so
system_ext/lib/rfsa/adsp/libtracker_6dof_skel_8250.so
+system_ext/lib/rfsa/adsp/libtracker_6dof_skel_8350.so
+system_ext/lib/libStereoRectifyWrapper.so
system_ext/lib/libqvr_cam_cdsp_driver_stub.so
system_ext/lib/libqvr_eyetracking_plugin.so
system_ext/lib/libqvr_cdsp_driver_stub.so
+system_ext/lib64/libStereoRectifyWrapper.so
system_ext/lib64/libqvrcamera_client.qti.so
system_ext/lib64/libqvrservice_client.qti.so
system_ext/lib64/libqvrservice_ov7251_hvx_tuning.so
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 8e12f24..739edb7 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -23,7 +23,7 @@
DEVICE=zenfone8
VENDOR=asus
-INITIAL_COPYRIGHT_YEAR=2019
+INITIAL_COPYRIGHT_YEAR=2021
# Load extractutils and do some sanity checks
MY_DIR="${BASH_SOURCE%/*}"