Added few more stubs so that control reaches to DestroyDevice().

[mesa.git] / src / compiler / Android.mk

diff --git a/src/compiler/Android.mk b/src/compiler/Android.mk
index 888780ba3fb2a2262ba7e0d56787f01fbe8ba88d..1e81ca546426a1bd5595a750d7ab204eaada5865 100644 (file)
--- a/src/compiler/Android.mk
+++ b/src/compiler/Android.mk
@@ -22,7 +22,8 @@
 
 LOCAL_PATH := $(call my-dir)
 
-include $(LOCAL_PATH)/Makefile.sources
+include $(LOCAL_PATH)/Android.glsl.mk
+include $(LOCAL_PATH)/Android.nir.mk
 
 # ---------------------------------------
 # Build libmesa_compiler
@@ -30,38 +31,22 @@ include $(LOCAL_PATH)/Makefile.sources
 
 include $(CLEAR_VARS)
 
+include $(LOCAL_PATH)/Makefile.sources
 LOCAL_SRC_FILES := $(LIBCOMPILER_FILES)
 
 LOCAL_C_INCLUDES := \
        $(MESA_TOP)/src/mapi \
        $(MESA_TOP)/src/mesa \
        $(MESA_TOP)/src/gallium/include \
-       $(MESA_TOP)/src/gallium/auxiliary
+       $(MESA_TOP)/src/gallium/auxiliary \
+       $(dir $(MESA_GEN_GLSL_H))
+
+LOCAL_GENERATED_SOURCES += \
+       $(MESA_GEN_GLSL_H)
 
 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)