From f83f9d7daa0995c8f6a15c356ac874acb4432144 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tapani=20P=C3=A4lli?= <tapani.palli@intel.com>
Date: Fri, 6 Sep 2019 08:05:02 +0300
Subject: [PATCH] android: fix linking issues with liblog
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

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>
---
 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
-- 
2.30.2