commit 4e90814306dfe3e2dfef7258b6d4d3fd6c161c2c
author yangbill <yangbill@google.com> Wed May 09 17:56:28 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed May 09 17:56:28 2018 -0700
tree e3a61fd2e5de3029c682308db1e166ed698c861c
parent f29014c082061216e7126c186ca57b7b4afebcba
parent 26f5fb8d60a24e896732a9ba07ad61fe82b1024c

Merge "Build System: Fix rpath error if native executable under testcase folder." am: 5c3646c201
am: 26f5fb8d60

Change-Id: I6a167a932833b60da5ade47511f2d239c591315e

core/host_executable_internal.mk

diff --git a/core/host_executable_internal.mk b/core/host_executable_internal.mk
index c4f9f66..e72c419 100644
--- a/core/host_executable_internal.mk
+++ b/core/host_executable_internal.mk
@@ -33,7 +33,7 @@
 
 my_libdir := $(notdir $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)OUT_SHARED_LIBRARIES))
 ifeq ($(LOCAL_MODULE_CLASS),NATIVE_TESTS)
-$(LOCAL_BUILT_MODULE): PRIVATE_RPATHS := ../../$(my_libdir)
+$(LOCAL_BUILT_MODULE): PRIVATE_RPATHS := ../../$(my_libdir) ../../../$(my_libdir)
 else
 $(LOCAL_BUILT_MODULE): PRIVATE_RPATHS := ../$(my_libdir) $(my_libdir)
 endif