commit 50b205a73aeaaac556dd2c2b1d11122d39880852
author John Stultz <jstultz@google.com> Wed Jul 06 23:52:43 2022 +0000
committer Amit Pundir <amit.pundir@linaro.org> Thu Jul 07 11:14:44 2022 +0530
tree a2c361a78939a450e727a41c4ab82db0b21bcdc7
parent 89cf151e2bbee40107967b07e8b6586824428cbc

linaro-vendor-package: Workaround for mesa_prebuilt build issue

The mesa_prebuilt Android.mk's are getting included regardless
of the expected version, which results in the following build
failure:
  build/make/core/base_rules.mk:342: error: vendor/linaro/db845c/20220629/mesa_prebuilt: MODULE.TARGET.SHARED_LIBRARIES.libEGL_mesa already defined by vendor/linaro/db845c/20220303/mesa_prebuilt.
  00:00:47 ckati failed with: exit status 1

So this patch adds some logic to make sure only the expected
version gets added.

Signed-off-by: John Stultz <jstultz@google.com>
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Change-Id: I00a24f39cb92157084c573c950375160b0586c33

src/db845c/mesa_prebuilt/Android.mk

diff --git a/src/db845c/mesa_prebuilt/Android.mk b/src/db845c/mesa_prebuilt/Android.mk
index 6282196..bdadfc2 100644
--- a/src/db845c/mesa_prebuilt/Android.mk
+++ b/src/db845c/mesa_prebuilt/Android.mk
@@ -4,6 +4,8 @@
 
 LOCAL_PATH := $(call my-dir)
 
+ifeq ($(findstring $(EXPECTED_LINARO_VENDOR_VERSION), $(LOCAL_PATH)), $(EXPECTED_LINARO_VENDOR_VERSION))
+
 include $(CLEAR_VARS)
 LOCAL_MODULE := libEGL_mesa
 LOCAL_MODULE_RELATIVE_PATH := egl
@@ -118,3 +120,4 @@
 
 endif
 endif
+endif