summaryrefslogtreecommitdiffstats
path: root/src/gallium/targets/dri
diff options
context:
space:
mode:
authorKishore Kadiyala <[email protected]>2019-03-11 11:23:03 +0200
committerTapani Pälli <[email protected]>2019-03-25 10:11:57 +0200
commite1d80571606684af869317837902abc6f6e82017 (patch)
treed354842603413e81f8df7e5e99d257fd9b5c186e /src/gallium/targets/dri
parent01cf39003517c6842ad8684e5ba30552d54e3570 (diff)
android: static link with libexpat with Android O+
In Android O, MESA needs to statically link libexpat so that it's in same VNDK namespace. v2: apply change also to anv driver (Tapani) v3: use += in anv change (Eric Engestrom) Change-Id: I82b0be5c817c21e734dfdf5bfb6a9aa1d414ab33 Signed-off-by: Kishore Kadiyala <[email protected]> Signed-off-by: Tapani Pälli <[email protected]> Reviewed-by: Eric Engestrom <[email protected]>
Diffstat (limited to 'src/gallium/targets/dri')
-rw-r--r--src/gallium/targets/dri/Android.mk10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/gallium/targets/dri/Android.mk b/src/gallium/targets/dri/Android.mk
index 7638a67b26f..6134251b5ca 100644
--- a/src/gallium/targets/dri/Android.mk
+++ b/src/gallium/targets/dri/Android.mk
@@ -42,9 +42,17 @@ LOCAL_LDFLAGS := \
LOCAL_SHARED_LIBRARIES := \
libdl \
libglapi \
- libexpat \
libz
+# If Android version >=8 MESA should static link libexpat else should dynamic link
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 27; echo $$?), 0)
+LOCAL_STATIC_LIBRARIES := \
+ libexpat
+else
+LOCAL_SHARED_LIBRARIES += \
+ libexpat
+endif
+
ifeq ($(USE_LIBBACKTRACE),true)
LOCAL_SHARED_LIBRARIES += libbacktrace
endif