summaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorRob Herring <[email protected]>2017-03-21 13:51:16 -0500
committerEmil Velikov <[email protected]>2017-03-22 17:52:06 +0000
commit5410c60112c8a5cceb3e6531ff7d2b8669b5635d (patch)
treedbfde57ea39367a0052f1f51b17718c73791adc4 /src/gallium
parent50a9b0cb43df3380e508e87aa6a7d739ba130723 (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/gallium')
-rw-r--r--src/gallium/state_trackers/dri/Android.mk6
-rw-r--r--src/gallium/targets/dri/Android.mk4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/gallium/state_trackers/dri/Android.mk b/src/gallium/state_trackers/dri/Android.mk
index 4bdd136ea97..fd322a31383 100644
--- a/src/gallium/state_trackers/dri/Android.mk
+++ b/src/gallium/state_trackers/dri/Android.mk
@@ -31,14 +31,14 @@ LOCAL_SRC_FILES := $(common_SOURCES)
LOCAL_C_INCLUDES := \
$(MESA_TOP)/src/mapi \
- $(MESA_TOP)/src/mesa \
+ $(MESA_TOP)/src/mesa
LOCAL_EXPORT_C_INCLUDE_DIRS := \
$(LOCAL_PATH) \
- $(LOCAL_C_INCLUDES) \
+ $(LOCAL_C_INCLUDES)
LOCAL_STATIC_LIBRARIES := \
- libmesa_dri_common \
+ libmesa_dri_common
ifneq ($(filter swrast,$(MESA_GPU_DRIVERS)),)
LOCAL_SRC_FILES += $(drisw_SOURCES)
diff --git a/src/gallium/targets/dri/Android.mk b/src/gallium/targets/dri/Android.mk
index dec8f055410..940f5009a51 100644
--- a/src/gallium/targets/dri/Android.mk
+++ b/src/gallium/targets/dri/Android.mk
@@ -41,7 +41,7 @@ LOCAL_CFLAGS :=
LOCAL_SHARED_LIBRARIES := \
libdl \
libglapi \
- libexpat \
+ libexpat
ifneq ($(filter freedreno,$(MESA_GPU_DRIVERS)),)
LOCAL_CFLAGS += -DGALLIUM_FREEDRENO
@@ -107,7 +107,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
libmesa_gallium \
libmesa_pipe_loader \
libmesa_util \
- libmesa_loader \
+ libmesa_loader
LOCAL_STATIC_LIBRARIES :=