p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Improve dotdot workaround when src begins with '/'"

This commit is contained in:
Dan Willemsen 2016-10-31 23:39:36 +00:00 committed by Gerrit Code Review
parent 515f43bb6e c57894c204
commit 7918e5121a
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/binary.mk
View File

@ -324,6 +324,10 @@ $(error $(my_missing_exclude_files))
endif endif
my_src_files := $(filter-out $(my_src_files_exclude),$(my_src_files)) 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)) my_clang := $(strip $(LOCAL_CLANG))
ifdef LOCAL_CLANG_$(my_32_64_bit_suffix) ifdef LOCAL_CLANG_$(my_32_64_bit_suffix)
my_clang := $(strip $(LOCAL_CLANG_$(my_32_64_bit_suffix))) my_clang := $(strip $(LOCAL_CLANG_$(my_32_64_bit_suffix)))