diff options
| author | Jason Ekstrand <[email protected]> | 2016-04-13 20:25:39 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2016-04-13 20:25:39 -0700 |
| commit | 12f88ba32a14ea79134f4e995a55149f078a2f27 (patch) | |
| tree | 9070861dced23d0ad7dbec598bfd96b686eb7bf1 /src/compiler/Android.mk | |
| parent | 79fbec30fc16399ede9385ef52cb62cefbb388f4 (diff) | |
| parent | 171a570f388b2895d14f6d5418c99573cffd6369 (diff) | |
Merge remote-tracking branch 'public/master' into vulkan
Diffstat (limited to 'src/compiler/Android.mk')
| -rw-r--r-- | src/compiler/Android.mk | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/src/compiler/Android.mk b/src/compiler/Android.mk index 888780ba3fb..ac0ced58334 100644 --- a/src/compiler/Android.mk +++ b/src/compiler/Android.mk @@ -43,25 +43,6 @@ LOCAL_MODULE := libmesa_compiler include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) -# --------------------------------------- -# Build libmesa_nir -# --------------------------------------- - -include $(CLEAR_VARS) +include $(LOCAL_PATH)/Android.glsl.mk -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.nir.mk |