this will be shared between OpenGL and Vulkan drivers
Signed-off-by: Tapani Pälli <tapani.pa...@intel.com>
---
src/mesa/drivers/dri/i965/Android.mk | 32 ++++++++++++++++++++++++++++----
1 file changed, 28 insertions(+), 4 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/Android.mk
b/src/mesa/drivers/dri/i965/Android.mk
index b4f1adf..08d62f0 100644
--- a/src/mesa/drivers/dri/i965/Android.mk
+++ b/src/mesa/drivers/dri/i965/Android.mk
@@ -152,6 +152,32 @@ include $(MESA_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)
# ---------------------------------------
+# Build libmesa_i965_compiler
+# ---------------------------------------
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libmesa_i965_compiler
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+
+LOCAL_SRC_FILES := \
+ $(i965_compiler_FILES) \
+
+LOCAL_C_INCLUDES := \
+ $(MESA_DRI_C_INCLUDES) \
+ $(MESA_TOP)/src/intel \
+ $(MESA_TOP)/src/compiler/nir \
+ $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_nir,,)/nir \
+ $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_glsl,,)/glsl \
+
+LOCAL_SHARED_LIBRARIES := \
+ libdrm_intel
+
+include $(LOCAL_PATH)/Android.gen.mk
+include $(MESA_COMMON_MK)
+include $(BUILD_STATIC_LIBRARY)
+
+# ---------------------------------------
# Build i965_dri
# ---------------------------------------
@@ -177,7 +203,6 @@ LOCAL_C_INCLUDES := \
$(MESA_DRI_C_INCLUDES)
LOCAL_SRC_FILES := \
- $(i965_compiler_FILES) \
$(i965_FILES)
LOCAL_WHOLE_STATIC_LIBRARIES := \
@@ -185,7 +210,8 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
$(I965_PERGEN_LIBS) \
libmesa_intel_common \
libmesa_blorp \
- libmesa_isl
+ libmesa_isl \
+ libmesa_i965_compiler \
LOCAL_SHARED_LIBRARIES := \
$(MESA_DRI_SHARED_LIBRARIES) \
@@ -195,7 +221,5 @@ LOCAL_GENERATED_SOURCES := \
$(MESA_DRI_OPTIONS_H) \
$(MESA_GEN_NIR_H)
-include $(LOCAL_PATH)/Android.gen.mk
-
include $(MESA_COMMON_MK)
include $(BUILD_SHARED_LIBRARY)
--
2.7.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
