Commit 5410c601 authored by Rob Herring's avatar Rob Herring Committed by Emil Velikov

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's avatarRob Herring <robh@kernel.org>
Reviewed-by: default avatarEmil Velikov <emil.velikov@collabora.com>
parent 50a9b0cb
......@@ -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
......
......@@ -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)/, \
......
......@@ -32,7 +32,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := \
$(NIR_FILES) \
$(SPIRV_FILES) \
$(SPIRV_FILES)
LOCAL_C_INCLUDES := \
$(MESA_TOP)/src/mapi \
......
......@@ -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
......
......@@ -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)
......
......@@ -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 :=
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment