Mesa (master): android/i965: add libmesa_i965_compiler static library

[Tapani Pälli]

Module: Mesa
Branch: master
Commit: 3ca600fe71ee505d6e6a4cea6a7a3729168ff78f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3ca600fe71ee505d6e6a4cea6a7a3729168ff78f

Author: Tapani Pälli <tapani.palli at intel.com>
Date:   Thu Nov 10 10:20:26 2016 +0200

android/i965: add libmesa_i965_compiler static library

this will be shared between OpenGL and Vulkan drivers

Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>

---

 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..7dea3c2 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)