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 <kishore.kadiyala@intel.com>
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>

diff --git a/src/gallium/targets/dri/Android.mk b/src/gallium/targets/dri/Android.mk
index 7638a67b26f4258d85b4cdadb6d75e4f831d8952..6134251b5ca092c7e1fd4741cb817b98a6a6f188 100644 (file)
--- 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

diff --git a/src/intel/Android.common.mk b/src/intel/Android.common.mk
index faec6b3ea4e6f810092048a0b5fe936b53ba7f2d..79d9f1284a0f2e9a28f3ef4c66f245b8f093d6e5 100644 (file)
--- a/src/intel/Android.common.mk
+++ b/src/intel/Android.common.mk
@@ -38,7 +38,17 @@ LOCAL_C_INCLUDES := \
        $(MESA_TOP)/src/mapi \
        $(MESA_TOP)/src/mesa
 
-LOCAL_SHARED_LIBRARIES := libexpat libz liblog
+LOCAL_SHARED_LIBRARIES := 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)
+LOCAL_STATIC_LIBRARIES := \
+       libexpat
+else
+LOCAL_SHARED_LIBRARIES += \
+       libexpat
+endif
+
 
 LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml
 

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
 
-LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES) libexpat libz libsync liblog
+LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES) libz libsync liblog
 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)

diff --git a/src/mesa/drivers/dri/Android.mk b/src/mesa/drivers/dri/Android.mk
index 53ff4b4f632c727295305a611c2f20aab8959e87..60c8476a38a7b6955bf7583ab338f35990077104 100644 (file)
--- a/src/mesa/drivers/dri/Android.mk
+++ b/src/mesa/drivers/dri/Android.mk
@@ -49,11 +49,19 @@ MESA_DRI_WHOLE_STATIC_LIBRARIES := \
 MESA_DRI_SHARED_LIBRARIES := \
        libcutils \
        libdl \
-       libexpat \
        libglapi \
        liblog \
        libz
 
+# If Android version >=8 MESA should static link libexpat else should dynamic link
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 27; echo $$?), 0)
+MESA_DRI_WHOLE_STATIC_LIBRARIES += \
+       libexpat
+else
+MESA_DRI_SHARED_LIBRARIES += \
+       libexpat
+endif
+
 #-----------------------------------------------
 # Build drivers and libmesa_dri_common
 

diff --git a/src/util/Android.mk b/src/util/Android.mk
index 2d59e1ae15e8fbc6535bfeb98588504c27fcefac..6d770ca95756aebe52b1116ab0c97923cefe1f69 100644 (file)
--- a/src/util/Android.mk
+++ b/src/util/Android.mk
@@ -41,8 +41,14 @@ LOCAL_C_INCLUDES := \
        $(MESA_TOP)/src/gallium/include \
        $(MESA_TOP)/src/gallium/auxiliary
 
+# 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
 
 LOCAL_MODULE := libmesa_util