From 3ca600fe71ee505d6e6a4cea6a7a3729168ff78f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tapani=20P=C3=A4lli?= Date: Thu, 10 Nov 2016 10:20:26 +0200 Subject: [PATCH] android/i965: add libmesa_i965_compiler static library MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit this will be shared between OpenGL and Vulkan drivers Signed-off-by: Tapani Pälli Reviewed-by: Emil Velikov Reviewed-by: Jason Ekstrand --- 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 b4f1adf6ca8..7dea3c25076 100644 --- a/src/mesa/drivers/dri/i965/Android.mk +++ b/src/mesa/drivers/dri/i965/Android.mk @@ -151,6 +151,32 @@ LOCAL_CFLAGS := -DGEN_VERSIONx10=90 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.30.2