diff options
| author | Rob Herring <[email protected]> | 2017-03-21 13:51:16 -0500 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-03-22 17:52:06 +0000 |
| commit | 5410c60112c8a5cceb3e6531ff7d2b8669b5635d (patch) | |
| tree | dbfde57ea39367a0052f1f51b17718c73791adc4 /src/compiler | |
| parent | 50a9b0cb43df3380e508e87aa6a7d739ba130723 (diff) | |
Android: clean-up trailing '\' in make variables
Fixed with the following command:
perl -pe 'BEGIN{undef $/;} s/ \\\n\n/\n\n/smg' $(find . -name 'Android.*')
Signed-off-by: Rob Herring <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/Android.glsl.gen.mk | 4 | ||||
| -rw-r--r-- | src/compiler/Android.nir.mk | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/Android.glsl.gen.mk b/src/compiler/Android.glsl.gen.mk index d7623e5781d..cdd786aa87c 100644 --- a/src/compiler/Android.glsl.gen.mk +++ b/src/compiler/Android.glsl.gen.mk @@ -35,14 +35,14 @@ LOCAL_C_INCLUDES += \ $(intermediates)/glsl \ $(intermediates)/glsl/glcpp \ $(LOCAL_PATH)/glsl \ - $(LOCAL_PATH)/glsl/glcpp \ + $(LOCAL_PATH)/glsl/glcpp LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \ $(LIBGLCPP_GENERATED_FILES) \ $(LIBGLSL_GENERATED_FILES)) LOCAL_EXPORT_C_INCLUDE_DIRS += \ - $(intermediates)/glsl \ + $(intermediates)/glsl # Modules using libmesa_nir must set LOCAL_GENERATED_SOURCES to this MESA_GEN_GLSL_H := $(addprefix $(call local-generated-sources-dir)/, \ diff --git a/src/compiler/Android.nir.mk b/src/compiler/Android.nir.mk index d08f5694a22..f021b809f05 100644 --- a/src/compiler/Android.nir.mk +++ b/src/compiler/Android.nir.mk @@ -32,7 +32,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := \ $(NIR_FILES) \ - $(SPIRV_FILES) \ + $(SPIRV_FILES) LOCAL_C_INCLUDES := \ $(MESA_TOP)/src/mapi \ |