Merge some upstream updates

Signed-off-by: engstk <eng.stk@sapo.pt>

Author: engstk

AndroidBoard.mk Android.mkAndroidBoard.mk renamed to Android.mk

@@ -95,7 +95,7 @@ TW_NO_SCREEN_BLANK := true
 TW_USE_TOOLBOX := true
 
 # Encryption
-PLATFORM_SECURITY_PATCH := 2025-12-31
+PLATFORM_SECURITY_PATCH := 2099-12-31
 TW_INCLUDE_CRYPTO := true
 TW_INCLUDE_CRYPTO_FBE := true
 
@@ -110,3 +110,5 @@ TW_Y_OFFSET := 80
 TW_H_OFFSET := -80
 TW_HAS_EDL_MODE := true
 TW_NO_USB_STORAGE := true
+PLATFORM_VERSION := 18.0.0
+TW_INCLUDE_RESETPROP := true

BoardConfig.mk

@@ -1,13 +1,38 @@
 
 LOCAL_PATH := device/oneplus/enchilada
 
-# Getting this to build in my local omni tree proved quite difficult so just using a prebuilt update_engine_sideload for now.
-# Oddly enough, OnePlus stock recovery does not include an update_engine_sideload binary either.
+# define hardware platform
+PRODUCT_PLATFORM := sdm845
+
+#TEST
+# A/B support
+PRODUCT_PACKAGES += \
+    otapreopt_script \
+    cppreopts.sh \
+    update_engine \
+    update_verifier \
+    update_engine_sideload
+
+PRODUCT_PACKAGES += \
+    bootctrl.sdm845
+
+AB_OTA_POSTINSTALL_CONFIG += \
+    RUN_POSTINSTALL_system=true \
+    POSTINSTALL_PATH_system=system/bin/otapreopt_script \
+    FILESYSTEM_TYPE_system=ext4 \
+    POSTINSTALL_OPTIONAL_system=true
+
 # Enable update engine sideloading by including the static version of the
 # boot_control HAL and its dependencies.
-#PRODUCT_STATIC_BOOT_CONTROL_HAL := \
-#    bootctrl.msm8998 \
-#    libsparse
+PRODUCT_STATIC_BOOT_CONTROL_HAL := \
+    bootctrl.sdm845 \
+    libgptutils \
+    libz \
+    libcutils
+
+
+# Boot control HAL
+PRODUCT_PACKAGES += \
+    android.hardware.boot@1.0-impl \
+    android.hardware.boot@1.0-service
 
-#PRODUCT_PACKAGES += \
-#    update_engine_sideload

device.mk

@@ -29,10 +29,15 @@ $(call inherit-product, device/oneplus/enchilada/device.mk)
 PRODUCT_DEVICE := enchilada
 PRODUCT_NAME := omni_enchilada
 PRODUCT_BRAND := OnePlus
-PRODUCT_MODEL := OnePlus A6003
+PRODUCT_MODEL := OnePlus A6000
 PRODUCT_MANUFACTURER := OnePlus
 
 PRODUCT_BUILD_PROP_OVERRIDES += \
     PRODUCT_NAME=OnePlus6 \
     BUILD_PRODUCT=OnePlus6 \
     TARGET_DEVICE=OnePlus6
+
+# HACK: Set vendor patch level
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.vendor.build.security_patch=2099-12-31
+

omni_enchilada.mk

@@ -32,26 +32,26 @@ mount -t ext4 -o ro "$syspath" /s
 
 is_fastboot_twrp=$(getprop ro.boot.fastboot)
 if [ ! -z "$is_fastboot_twrp" ]; then
-	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"
+	osver=$(getprop ro.build.version.release)
+	patchlevel=$(getprop ro.build.version.security_patch)
+	resetprop ro.build.version.release "$osver"
+	resetprop ro.build.version.security_patch "$patchlevel"
 	finish
 fi
 
 if [ -f /s/system/build.prop ]; 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' /s/system/build.prop  | cut -f2 -d'=')
 	patchlevel=$(grep -i 'ro.build.version.security_patch' /s/system/build.prop  | cut -f2 -d'=')
-	setprop ro.build.version.release "$osver"
-	setprop ro.build.version.security_patch "$patchlevel"
+	resetprop ro.build.version.release "$osver"
+	resetprop ro.build.version.security_patch "$patchlevel"
 	finish
 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"
+	osver=$(getprop ro.build.version.release)
+	patchlevel=$(getprop ro.build.version.security_patch)
+	resetprop ro.build.version.release "$osver"
+	resetprop ro.build.version.security_patch "$patchlevel"
 	finish
 fi
 
@@ -101,3 +101,4 @@ relink /v/bin/hw/android.hardware.keymaster@3.0-service-qti
 
 finish
 exit 0
+