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

Commit 371c403f 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

Change-Id: Iefac888b97477ce1a5479a5a931108dcfe229aa3
parents b90bd1c6 05b0da94

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