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

Commit 74550c8b 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:... 

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

Change-Id: I7d906092c8619cf79a9a07a85ff0e4729cb1851d
parents 426b132b f7df136f

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)))