Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b52486c1 authored by yangbill's avatar yangbill Committed by android-build-merger
Browse files

Merge "Build System: Fix rpath error if native executable under testcase... 

Merge "Build System: Fix rpath error if native executable under testcase folder." am: 5c3646c2 am: 26f5fb8d
am: 4e908143

Change-Id: I9cee663419434e54ad8933af3c2fa07bb633a61f
parents 6b8c4016 4e908143

core/host_executable_internal.mk

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ $(LOCAL_BUILT_MODULE): PRIVATE_HOST_LIBPROFILE_RT := $(my_host_libprofile_rt) 


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