Mesa (master): android: fix linking issues with liblog
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Sat Sep 7 10:36:10 UTC 2019
Module: Mesa
Branch: master
Commit: f83f9d7daa0995c8f6a15c356ac874acb4432144
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f83f9d7daa0995c8f6a15c356ac874acb4432144
Author: Tapani Pälli <tapani.palli at intel.com>
Date: Fri Sep 6 08:05:02 2019 +0300
android: fix linking issues with liblog
Fixes Android build errors observed in Intel CI.
Fixes: f9f7cbc1aa3 "util: android logging support"
Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
Reviewed-by: Rob Clark <robdclark at gmail.com>
---
src/gallium/targets/dri/Android.mk | 3 ++-
src/util/Android.mk | 2 ++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/gallium/targets/dri/Android.mk b/src/gallium/targets/dri/Android.mk
index c7d564a237e..3059e839c00 100644
--- a/src/gallium/targets/dri/Android.mk
+++ b/src/gallium/targets/dri/Android.mk
@@ -42,7 +42,8 @@ LOCAL_LDFLAGS := \
LOCAL_SHARED_LIBRARIES := \
libdl \
libglapi \
- libz
+ libz \
+ liblog
# If Android version >=8 MESA should static link libexpat else should dynamic link
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 27; echo $$?), 0)
diff --git a/src/util/Android.mk b/src/util/Android.mk
index 6d770ca9575..13e44f97c2a 100644
--- a/src/util/Android.mk
+++ b/src/util/Android.mk
@@ -50,6 +50,8 @@ LOCAL_SHARED_LIBRARIES := \
libexpat
endif
+LOCAL_SHARED_LIBRARIES += liblog
+
LOCAL_MODULE := libmesa_util
# Generated sources
More information about the mesa-commit
mailing list