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@intel.com>
Reviewed-by: Rob Clark <robdclark@gmail.com>

diff --git a/src/gallium/targets/dri/Android.mk b/src/gallium/targets/dri/Android.mk
index c7d564a237ea89d46176acd4580d1f04c9f4292a..3059e839c007154ece8d5ca73b1f5a2610785bd6 100644 (file)
--- 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 6d770ca95756aebe52b1116ab0c97923cefe1f69..13e44f97c2a2469b1ad0e58a4f81df65ca3ebde3 100644 (file)
--- 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