commit 05b0da9441eba5750b399c7107b4565c49548be5
author Dan Willemsen <dwillemsen@google.com> Mon Oct 31 23:42:43 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Oct 31 23:42:43 2016 +0000
tree d1da64cba3f6e488c1379bc85f9c66b125d35714
parent e402dd8bb81ed5f5d7b803ad090e23a89ee90db5
parent 7918e5121af797868e01f06b84684a79a29f5be8

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

Change-Id: I049e8fa30b713f3aceeb1ca579e2550f22c4a10d

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