android: i965/tiled_memcpy: fix Android makefile

Submitted by Mauro Rossi on May 26, 2018, 9:18 a.m.

Details

Message ID 20180526091852.20082-1-issor.oruam@gmail.com
State New
Headers show
Series "android: i965/tiled_memcpy: fix Android makefile" ( rev: 1 ) in Mesa

Not browsing as part of any series.

Commit Message

Mauro Rossi May 26, 2018, 9:18 a.m.
Add building rules for libmesa_intel_tiled_memcpy for Android
and related whole static dependency in i965_dri

Fixes: d21c086d81 ("i965/tiled_memcpy: inline movntdqa loads in tiled_to_linear")
Signed-off-by: Mauro Rossi <issor.oruam@gmail.com>
---
 src/mesa/drivers/dri/i965/Android.mk | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/src/mesa/drivers/dri/i965/Android.mk b/src/mesa/drivers/dri/i965/Android.mk
index 043b7c5109..1271ec6982 100644
--- a/src/mesa/drivers/dri/i965/Android.mk
+++ b/src/mesa/drivers/dri/i965/Android.mk
@@ -261,6 +261,28 @@  LOCAL_CFLAGS := -DGEN_VERSIONx10=110
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 
+# ---------------------------------------
+# Build libmesa_intel_tiled_memcpy
+# ---------------------------------------
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libmesa_intel_tiled_memcpy
+
+ifeq ($(ARCH_X86_HAVE_SSE4_1),true)
+LOCAL_CFLAGS += \
+	-DUSE_SSE41
+endif
+
+LOCAL_C_INCLUDES := \
+	$(MESA_DRI_C_INCLUDES) \
+	$(MESA_TOP)/src/intel
+
+LOCAL_SRC_FILES := $(intel_tiled_memcpy_FILES)
+
+include $(MESA_COMMON_MK)
+include $(BUILD_STATIC_LIBRARY)
+
 # ---------------------------------------
 # Build i965_dri
 # ---------------------------------------
@@ -293,7 +315,8 @@  LOCAL_WHOLE_STATIC_LIBRARIES := \
 	libmesa_intel_common \
 	libmesa_isl \
 	libmesa_blorp \
-	libmesa_intel_compiler
+	libmesa_intel_compiler \
+	libmesa_intel_tiled_memcpy
 
 LOCAL_SHARED_LIBRARIES := \
 	$(MESA_DRI_SHARED_LIBRARIES)

Comments

On Saturday, May 26, 2018 2:18:52 AM PDT Mauro Rossi wrote:
> Add building rules for libmesa_intel_tiled_memcpy for Android
> and related whole static dependency in i965_dri
> 
> Fixes: d21c086d81 ("i965/tiled_memcpy: inline movntdqa loads in tiled_to_linear")
> Signed-off-by: Mauro Rossi <issor.oruam@gmail.com>
> ---
>  src/mesa/drivers/dri/i965/Android.mk | 25 ++++++++++++++++++++++++-
>  1 file changed, 24 insertions(+), 1 deletion(-)

Thanks, Mauro.

I didn't see this patch before reverting the lot of them.  I'll plan to
fold this in when I reapply them next week and credit you for the
Android build system work.

Sorry for not thinking of it, again...