summaryrefslogtreecommitdiffstats
path: root/src/compiler/Android.mk
diff options
context:
space:
mode:
authorEmil Velikov <emil.velikov@collabora.com>2016-04-05 14:48:20 +0100
committerEmil Velikov <emil.l.velikov@gmail.com>2016-04-11 19:08:23 +0100
commit28da0d6922b32985949eabce7de9a329c18cae83 (patch)
treeb4ac30e671dc23807e6a17f326af1be38070953b /src/compiler/Android.mk
parent8d51500b2dec1dbe54a517e3b1448e96978e2256 (diff)
downloadexternal_mesa3d-28da0d6922b32985949eabce7de9a329c18cae83.tar.gz
external_mesa3d-28da0d6922b32985949eabce7de9a329c18cae83.tar.bz2
external_mesa3d-28da0d6922b32985949eabce7de9a329c18cae83.zip
compiler: android: flesh out nir into separate makefile
Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Acked-by: Jason Ekstrand <jason@jlekstrand.net>
Diffstat (limited to 'src/compiler/Android.mk')
-rw-r--r--src/compiler/Android.mk25
1 files changed, 2 insertions, 23 deletions
diff --git a/src/compiler/Android.mk b/src/compiler/Android.mk
index 6c3a855228..ac0ced5833 100644
--- a/src/compiler/Android.mk
+++ b/src/compiler/Android.mk
@@ -43,27 +43,6 @@ LOCAL_MODULE := libmesa_compiler
include $(MESA_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)
-# ---------------------------------------
-# Build libmesa_nir
-# ---------------------------------------
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
- $(NIR_FILES)
-
-LOCAL_C_INCLUDES := \
- $(MESA_TOP)/src/mapi \
- $(MESA_TOP)/src/mesa \
- $(MESA_TOP)/src/gallium/include \
- $(MESA_TOP)/src/gallium/auxiliary
-
-LOCAL_STATIC_LIBRARIES := libmesa_compiler
-
-LOCAL_MODULE := libmesa_nir
-
-include $(LOCAL_PATH)/Android.gen.mk
-include $(MESA_COMMON_MK)
-include $(BUILD_STATIC_LIBRARY)
-
include $(LOCAL_PATH)/Android.glsl.mk
+
+include $(LOCAL_PATH)/Android.nir.mk