diff options
| author | Tapani Pälli <[email protected]> | 2019-09-06 08:05:02 +0300 |
|---|---|---|
| committer | Tapani Pälli <[email protected]> | 2019-09-07 13:16:29 +0300 |
| commit | f83f9d7daa0995c8f6a15c356ac874acb4432144 (patch) | |
| tree | f97bd471c47d8b5a62b8d7f69d9351700d6d53c7 /src | |
| parent | dfb86405cfedea5f6500b45c3430b4339c8f8ff1 (diff) | |
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 <[email protected]>
Reviewed-by: Rob Clark <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/targets/dri/Android.mk | 3 | ||||
| -rw-r--r-- | src/util/Android.mk | 2 |
2 files changed, 4 insertions, 1 deletions
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 |