Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 67225fff authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "kbuild: PWD isn't set reliably by shell. srctree is the proper macro."

parents b887bbc6 0d736bf2

drivers/gud/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ ccflags-$(CONFIG_MOBICORE_DEBUG) += -DDEBUG 
ccflags-$(CONFIG_MOBICORE_VERBOSE) += -DDEBUG_VERBOSE



# Choose one platform from the folder

MOBICORE_PLATFORM := $(shell (ls -1 $(PWD)/$(GUD_ROOT_FOLDER)/MobiCoreDriver/platforms | tail -1) )

MOBICORE_PLATFORM := $(shell (ls -1 $(srctree)/$(GUD_ROOT_FOLDER)/MobiCoreDriver/platforms | tail -1) )

# Use the available platform folder

ccflags-y += -I$(GUD_ROOT_FOLDER)/MobiCoreDriver/platforms/$(MOBICORE_PLATFORM)

# MobiCore Driver includes

drivers/media/platform/msm/camera_v2/fd/Makefile

+1 −1
Original line number Diff line number Diff line 
GCC_VERSION      := $(shell $(CONFIG_SHELL) $(PWD)/scripts/gcc-version.sh $(CROSS_COMPILE)gcc)

GCC_VERSION      := $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-version.sh $(CROSS_COMPILE)gcc)

ccflags-y += -Idrivers/media/video/msm



obj-$(CONFIG_MSM_FD) += msm_fd_dev.o msm_fd_hw.o

drivers/media/platform/msm/camera_v2/jpeg_10/Makefile

+1 −1
Original line number Diff line number Diff line 
GCC_VERSION      := $(shell $(CONFIG_SHELL) $(PWD)/scripts/gcc-version.sh $(CROSS_COMPILE)gcc)

GCC_VERSION      := $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-version.sh $(CROSS_COMPILE)gcc)



ccflags-y += -Idrivers/media/platform/msm/camera_v2/jpeg_10

ccflags-y += -Idrivers/media/platform/msm/camera_v2/sensor/io

drivers/media/platform/msm/vpu/Makefile

+1 −1
Original line number Diff line number Diff line 
GCC_VERSION      := $(shell $(CONFIG_SHELL) $(PWD)/scripts/gcc-version.sh $(CROSS_COMPILE)gcc)

GCC_VERSION      := $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-version.sh $(CROSS_COMPILE)gcc)



obj-$(CONFIG_MSM_VPU) := 	\

		vpu_v4l2.o \