diff options
| author | Eric Anholt <[email protected]> | 2012-11-06 23:18:38 -0800 |
|---|---|---|
| committer | Chad Versace <[email protected]> | 2012-11-12 15:52:42 -0800 |
| commit | a665cf1226b80ec52a0c1a4a38378df4389e8ebf (patch) | |
| tree | 8d584081c8f73a06dd1a576bad0f4e371d4e648e /src/glsl/Android.mk | |
| parent | 34d4216e64101a692d5ffb3936e7261a1732953a (diff) | |
automake: Merge *_CXX_FILES variables in the glsl build.
Reviewed-by: Chad Versace <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/glsl/Android.mk')
| -rw-r--r-- | src/glsl/Android.mk | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/glsl/Android.mk b/src/glsl/Android.mk index f975d03d1bb..f5006ab03f6 100644 --- a/src/glsl/Android.mk +++ b/src/glsl/Android.mk @@ -36,8 +36,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := \ $(LIBGLCPP_FILES) \ - $(LIBGLSL_FILES) \ - $(LIBGLSL_CXX_FILES) + $(LIBGLSL_FILES) LOCAL_C_INCLUDES := \ external/astl/include \ @@ -59,7 +58,6 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := \ $(LIBGLCPP_FILES) \ $(LIBGLSL_FILES) \ - $(LIBGLSL_CXX_FILES) \ $(GLSL_SRCDIR)/builtin_compiler/builtin_stubs.cpp \ $(GLSL_COMPILER_CXX_FILES) |