commit f20360908a5653be4826678cd2b8b471ca98588d
author Alistair Delva <adelva@google.com> Tue May 19 16:20:16 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue May 19 16:20:16 2020 +0000
tree 36ce161d15bb00d1d3ac2fa2165d5f251cc11fd0
parent 45df757e51ac3ce10b41a2f20885323f042f6962
parent 706e20fc316108a4ded94ba9793cb1487d1b38e9

Merge "mesa: Fix broken GALLIUM_LIBS addition" am: 706e20fc31

Change-Id: I770ad09cf545110a9f993ade19ee746c6e08b5e5

src/gallium/drivers/tegra/Android.mk

diff --git a/src/gallium/drivers/tegra/Android.mk b/src/gallium/drivers/tegra/Android.mk
index 25a0181..948ba72 100644
--- a/src/gallium/drivers/tegra/Android.mk
+++ b/src/gallium/drivers/tegra/Android.mk
@@ -46,6 +46,6 @@
 
 ifneq ($(HAVE_GALLIUM_TEGRA),)
 GALLIUM_TARGET_DRIVERS += tegra
-GALLIUM_LIBS += $(LOCAL_MODULE) libmesa_winsys_tegra
-GALLIUM_SHARED_LIBS += $(LOCAL_SHARED_LIBRARIES)
+$(eval GALLIUM_LIBS += $(LOCAL_MODULE) libmesa_winsys_tegra)
+$(eval GALLIUM_SHARED_LIBS += $(LOCAL_SHARED_LIBRARIES))
 endif