commit 81dda7b637100caa0cddff64c52394cf3206d597
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Oct 17 18:59:15 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 17 18:59:15 2023 +0000
tree 4db70083a174c3188cbdad03ea672afb822e0ada
parent a592300f6046a118d2016ee6dfed813d9fc2f4da
parent fa66979a87e53d92dc717fd524f7958af20eb9f3

Merge "hikey/hikey960: Set verifiedbootstate property" into main

gralloc960/mali_gralloc_debug.cpp

diff --git a/gralloc960/mali_gralloc_debug.cpp b/gralloc960/mali_gralloc_debug.cpp
index 2b2b4a7..3737fbc 100644
--- a/gralloc960/mali_gralloc_debug.cpp
+++ b/gralloc960/mali_gralloc_debug.cpp
@@ -137,7 +137,7 @@
 		{
 			dumpSize = dumpStrings.size();
 			*outSize = (dumpSize < *outSize) ? dumpSize : *outSize;
-			memcpy(outBuffer, dumpStrings.string(), *outSize);
+			memcpy(outBuffer, dumpStrings.c_str(), *outSize);
 		}
 	}
 }

hikey.mk

diff --git a/hikey.mk b/hikey.mk
index a5ff4aa..31631af 100644
--- a/hikey.mk
+++ b/hikey.mk
@@ -3,7 +3,9 @@
 $(call inherit-product, device/linaro/hikey/hikey-common.mk)
 $(call inherit-product-if-exists, vendor/linaro/hikey960/$(EXPECTED_LINARO_VENDOR_VERSION)/hikey.mk)
 
-PRODUCT_PROPERTY_OVERRIDES += ro.opengles.version=131072
+PRODUCT_PROPERTY_OVERRIDES += \
+  ro.opengles.version=131072 \
+  ro.hardware.egl=mali
 
 PRODUCT_NAME := hikey
 PRODUCT_DEVICE := hikey

hikey960.mk

diff --git a/hikey960.mk b/hikey960.mk
index 342fa04..dd7082b 100644
--- a/hikey960.mk
+++ b/hikey960.mk
@@ -52,7 +52,9 @@
 $(call inherit-product, device/linaro/hikey/device-common.mk)
 $(call inherit-product-if-exists, vendor/linaro/hikey960/$(EXPECTED_LINARO_VENDOR_VERSION)/hikey960.mk)
 
-PRODUCT_PROPERTY_OVERRIDES += ro.opengles.version=196608
+PRODUCT_PROPERTY_OVERRIDES += \
+  ro.opengles.version=196608 \
+  ro.hardware.egl=mali
 
 #
 # Overrides