Snap for 8952093 from 59d1eb18e39efdddb5249be4bb17bd96b5cbc845 to sdk-releaseplatform-tools-33.0.3

Change-Id: Ie68ae02fe130682539418bab94f378688f18990f

6 files changed, 17 insertions, 31 deletions

diff --git a/device-common.mk b/device-common.mk
index 3833ca16..989ce7b7 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -28,15 +28,13 @@ ifneq (,$(wildcard $(LINARO_VENDOR_PATH)/hikey960/$(EXPECTED_LINARO_VENDOR_VERSI
   include $(LINARO_VENDOR_PATH)/hikey960/$(EXPECTED_LINARO_VENDOR_VERSION)/version.mk
   ifneq ($(TARGET_LINARO_VENDOR_VERSION), $(EXPECTED_LINARO_VENDOR_VERSION))
     $(warning TARGET_LINARO_VENDOR_VERSION ($(TARGET_LINARO_VENDOR_VERSION)) does not match exiting the build ($(EXPECTED_LINARO_VENDOR_VERSION)).)
-    $(warning Please download new binaries here:)
-    $(warning    $(VND_PKG_URL) )
-    $(warning And extract in the ANDROID_TOP_DIR)
+    $(warning Please download and extract the new binaries by running the following script:)
+    $(warning    ./device/linaro/hikey/fetch-vendor-package.sh )
   endif
 else
   $(warning Missing Linaro Vendor Package!)
-  $(warning Please download new binaries here:)
-  $(warning    $(VND_PKG_URL) )
-  $(warning And extract in the ANDROID_TOP_DIR)
+  $(warning Please download and extract the vendor binaries by running the following script:)
+  $(warning    ./device/linaro/hikey/fetch-vendor-package.sh )
 endif
 $(warning EXPECTED_LINARO_VENDOR_VERSION=$(EXPECTED_LINARO_VENDOR_VERSION))
 
diff --git a/fetch-vendor-package.sh b/fetch-vendor-package.sh
index cbadbdeb..0a50853c 100755
--- a/fetch-vendor-package.sh
+++ b/fetch-vendor-package.sh
@@ -13,6 +13,14 @@ PKG_FILE=extract-linaro_devices-${EXPECTED_LINARO_VENDOR_VERSION}
 
 pushd ${ANDROID_BUILD_TOP}
 
+# remove the older vendor-package, if any, because upstream
+# mesa prebuilts in linaro-vendor-package ain't declared
+# within a contained namespace and we can run into build
+# errors because of redefinition of mesa prebuilt modules
+# from the previous vendor-package.
+# FIXME move mesa prebuilts from Android.mk to Android.bp
+rm -rf ${ANDROID_BUILD_TOP}/vendor/linaro/
+
 if [ ! -e "${PKG_FILE}.tgz"  ]; then
     curl -L ${VND_PKG_URL} -o  ${PKG_FILE}.tgz
 fi
diff --git a/gralloc960/gralloc_helper.h b/gralloc960/gralloc_helper.h
index fea10e5e..3d2b4210 100644
--- a/gralloc960/gralloc_helper.h
+++ b/gralloc960/gralloc_helper.h
@@ -41,7 +41,7 @@
 
 #define GRALLOC_ALIGN(value, base) (((value) + ((base)-1)) & ~((base)-1))
 
-#define GRALLOC_UNUSED(x) ((void)x)
+#define GRALLOC_UNUSED(x) ((void)(x))
 
 static inline size_t round_up_to_page_size(size_t x)
 {
diff --git a/hikey.mk b/hikey.mk
index f869c71e..a5ff4aab 100644
--- a/hikey.mk
+++ b/hikey.mk
@@ -3,13 +3,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
 $(call inherit-product, device/linaro/hikey/hikey-common.mk)
 $(call inherit-product-if-exists, vendor/linaro/hikey960/$(EXPECTED_LINARO_VENDOR_VERSION)/hikey.mk)
 
-#setup dm-verity configs
-PRODUCT_SYSTEM_VERITY_PARTITION := /dev/block/platform/soc/f723d000.dwmmc0/by-name/system
-PRODUCT_VENDOR_VERITY_PARTITION := /dev/block/platform/soc/f723d000.dwmmc0/by-name/vendor
-$(call inherit-product, build/target/product/verity.mk)
-PRODUCT_SUPPORTS_BOOT_SIGNER := false
-PRODUCT_SUPPORTS_VERITY_FEC := false
-
 PRODUCT_PROPERTY_OVERRIDES += ro.opengles.version=131072
 
 PRODUCT_NAME := hikey
diff --git a/hikey/BoardConfig.mk b/hikey/BoardConfig.mk
index b30c3287..7c31ac76 100644
--- a/hikey/BoardConfig.mk
+++ b/hikey/BoardConfig.mk
@@ -10,20 +10,6 @@ BOARD_KERNEL_CMDLINE := androidboot.hardware=hikey firmware_class.path=/vendor/f
 BOARD_KERNEL_CMDLINE += androidboot.boot_devices=soc/f723d000.dwmmc0
 BOARD_KERNEL_CMDLINE += console=ttyAMA3,115200 androidboot.console=ttyAMA3
 
-# On kernels before 4.14, enable dtb fstab with android-verity. On kernels >=
-# 4.14, both dtb fstab and android-verity are deprecated, so until we have
-# avb2 support in the bootloader, don't enable either feature. The ramdisk
-# fstab needed for the new mechanism will be installed unconditionally; if
-# dtb fstab is present, it will override it automatically.
-ifneq ($(TARGET_KERNEL_USE),4.19)
-ifneq ($(TARGET_KERNEL_USE),4.14)
-BOARD_KERNEL_CMDLINE += overlay_mgr.overlay_dt_entry=hardware_cfg_enable_android_fstab_v2
-BOARD_KERNEL_CMDLINE += rootwait ro root=/dev/dm-0
-BOARD_KERNEL_CMDLINE += dm=\"system none ro,0 1 android-verity 179:9\"
-BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
-endif
-endif
-
 ifneq ($(TARGET_SENSOR_MEZZANINE),)
 BOARD_KERNEL_CMDLINE += overlay_mgr.overlay_dt_entry=hardware_cfg_$(TARGET_SENSOR_MEZZANINE)
 endif
diff --git a/vendor-package-ver.sh b/vendor-package-ver.sh
index 12f4a6f0..35b3ae49 100755
--- a/vendor-package-ver.sh
+++ b/vendor-package-ver.sh
@@ -1,8 +1,9 @@
 #!/bin/bash
 
-export EXPECTED_LINARO_VENDOR_VERSION=20220210
-export EXPECTED_LINARO_VENDOR_SHA=75efc8471f299f64716140712c0785b8e8aeaf5aa7e389a6f12f78ad4962420740da32f4535d795006e78c5f0b77a1cee8c168192a87f668103c00d87d480e6d
-export VND_PKG_URL=https://releases.linaro.org/android/aosp-linaro-vendor-package/extract-linaro_devices-20220210.tgz
+export EXPECTED_LINARO_VENDOR_VERSION=20220726
+#make sure to use sha512sum here
+export EXPECTED_LINARO_VENDOR_SHA=62ff5d98eb9ab568aff035857379fa1cc2dbd69e5cdb13124e577ac1abd70ff21013c19956b5ae9834e1f5dbed672f52663c22d404c060c2cb7fff8aa85067f1
+export VND_PKG_URL=https://releases.linaro.org/android/aosp-linaro-vendor-package/extract-linaro_devices-20220726.tgz
 
 if [ "$1" = "url" ]; then
  echo $VND_PKG_URL