projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
intel/fs/ra: Move assign_regs further down in the file
[mesa.git]
/
src
/
intel
/
Android.vulkan.mk
diff --git
a/src/intel/Android.vulkan.mk
b/src/intel/Android.vulkan.mk
index f38decbf3084d9a073f646351a768b1f48668a54..05922afdbe08c1e6bd7ffb1de84fbd8e98d8d456 100644
(file)
--- a/
src/intel/Android.vulkan.mk
+++ b/
src/intel/Android.vulkan.mk
@@
-337,8
+337,17
@@
LOCAL_WHOLE_STATIC_LIBRARIES := \
libmesa_intel_compiler \
libmesa_anv_entrypoints
libmesa_intel_compiler \
libmesa_anv_entrypoints
-LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES) lib
expat lib
z libsync liblog
+LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES) libz libsync liblog
LOCAL_HEADER_LIBRARIES += $(VULKAN_COMMON_HEADER_LIBRARIES)
LOCAL_HEADER_LIBRARIES += $(VULKAN_COMMON_HEADER_LIBRARIES)
+# 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
+
include $(MESA_COMMON_MK)
include $(BUILD_SHARED_LIBRARY)
include $(MESA_COMMON_MK)
include $(BUILD_SHARED_LIBRARY)