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 <robh@kernel.org>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>

diff --git a/Android.common.mk b/Android.common.mk
index 04045bd5a67781b36ae3ea94650505ec5cbef242..0130c585aed13f4638863ee947718aaa6bab6243 100644 (file)
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -76,7 +76,7 @@ LOCAL_CONLYFLAGS += \
 ifeq ($(strip $(MESA_ENABLE_ASM)),true)
 ifeq ($(TARGET_ARCH),x86)
 LOCAL_CFLAGS += \
-       -DUSE_X86_ASM \
+       -DUSE_X86_ASM
 
 endif
 endif

diff --git a/src/compiler/Android.glsl.gen.mk b/src/compiler/Android.glsl.gen.mk
index d7623e5781d8a890812aec00ed6f302b66186f4a..cdd786aa87cd2a5dd51b3b2e545b9dcc94fd6fca 100644 (file)
--- 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 d08f5694a223641b836c6e3555061e11e72e9737..f021b809f05f37ba0aef44968b96b6423cc8a4d4 100644 (file)
--- 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 \

diff --git a/src/egl/Android.mk b/src/egl/Android.mk
index bfd56a744df8ff4324668662850cc8a8b7d0730b..0227ad82c673449acaddf30c604d2909ec8f2587 100644 (file)
--- a/src/egl/Android.mk
+++ b/src/egl/Android.mk
@@ -45,7 +45,7 @@ LOCAL_CFLAGS := \
 
 LOCAL_C_INCLUDES := \
        $(MESA_TOP)/src/egl/main \
-       $(MESA_TOP)/src/egl/drivers/dri2 \
+       $(MESA_TOP)/src/egl/drivers/dri2
 
 LOCAL_STATIC_LIBRARIES := \
        libmesa_loader
@@ -55,7 +55,7 @@ LOCAL_SHARED_LIBRARIES := \
        libhardware \
        liblog \
        libcutils \
-       libgralloc_drm \
+       libgralloc_drm
 
 ifeq ($(shell echo "$(MESA_ANDROID_VERSION) >= 4.2" | bc),1)
 LOCAL_SHARED_LIBRARIES += libsync

diff --git a/src/gallium/state_trackers/dri/Android.mk b/src/gallium/state_trackers/dri/Android.mk
index 4bdd136ea9707d440dedce679149ee806fe22e6c..fd322a313832163962dea93aaadb2c0b0edaf4bf 100644 (file)
--- 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 dec8f055410e6e4acea0b2686af0d43c23c62cb3..940f5009a5174f1483c9502558da69edbc18ade8 100644 (file)
--- 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 :=