commit 4840c913b3b991e68829a0a62cd43a868cd41099
author Jiyong Park <jiyong@google.com> Wed Feb 13 21:33:51 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Feb 13 21:33:51 2019 -0800
tree 4b66c3bf69877240ebea7256ddedc85c45bc9555
parent 7de1297db386a7c6e883a8f596a3226bc85d8663
parent 6eeef21b9dfa3dffa6e80c3c13103c7d9b463be0

Merge "Drop /root when installing symbols"
am: 6eeef21b9d

Change-Id: I1026d4c952d703043e8ddb18329bdf849069cfe9

core/soong_cc_prebuilt.mk

diff --git a/core/soong_cc_prebuilt.mk b/core/soong_cc_prebuilt.mk
index 39cc0f0..dd33852 100644
--- a/core/soong_cc_prebuilt.mk
+++ b/core/soong_cc_prebuilt.mk
@@ -123,6 +123,8 @@
   ifdef LOCAL_SOONG_UNSTRIPPED_BINARY
     # Store a copy with symbols for symbolic debugging
     my_unstripped_path := $(TARGET_OUT_UNSTRIPPED)/$(patsubst $(PRODUCT_OUT)/%,%,$(my_module_path))
+    # drop /root as /root is mounted as /
+    my_unstripped_path := $(patsubst $(TARGET_OUT_UNSTRIPPED)/root/%,$(TARGET_OUT_UNSTRIPPED)/%, $(my_unstripped_path))
     symbolic_output := $(my_unstripped_path)/$(my_installed_module_stem)
     $(eval $(call copy-one-file,$(LOCAL_SOONG_UNSTRIPPED_BINARY),$(symbolic_output)))
     $(call add-dependency,$(LOCAL_BUILT_MODULE),$(symbolic_output))