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

Commit f7df136f authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Improve dotdot workaround when src begins with '/'" am: 7918e512 am: 05b0da94 

am: 371c403f

Change-Id: Ie44799480418a7280545b0e8b235df381f19ae6b
parents 4f9a3618 371c403f

core/binary.mk

+4 −0
Original line number Diff line number Diff line
@@ -324,6 +324,10 @@ $(error $(my_missing_exclude_files)) 
endif

my_src_files := $(filter-out $(my_src_files_exclude),$(my_src_files))



# Strip '/' from the beginning of each src file. This helps the ../ detection in case

# the source file is in the form of /../file

my_src_files := $(patsubst /%,%,$(my_src_files))



my_clang := $(strip $(LOCAL_CLANG))

ifdef LOCAL_CLANG_$(my_32_64_bit_suffix)

my_clang := $(strip $(LOCAL_CLANG_$(my_32_64_bit_suffix)))