commit 371c403fa853567862ad643a10bda7650029e2a0
author Dan Willemsen <dwillemsen@google.com> Mon Oct 31 23:45:14 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Oct 31 23:45:14 2016 +0000
tree 54bed32f3818fc4a47c5a87715ea70b6fe252e7b
parent b90bd1c6f95a0f448abd4fa547355b014cb89463
parent 05b0da9441eba5750b399c7107b4565c49548be5

Merge "Improve dotdot workaround when src begins with '/'" am: 7918e5121a
am: 05b0da9441

Change-Id: Iefac888b97477ce1a5479a5a931108dcfe229aa3

core/binary.mk

diff --git a/core/binary.mk b/core/binary.mk
index 0f9ef2f..28ac56f 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -324,6 +324,10 @@
 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)))