diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2014-04-25 23:47:10 -0700 |
|---|---|---|
| committer | Andrew Hsieh <andrewhsieh@google.com> | 2014-04-25 23:47:10 -0700 |
| commit | 140761af09832e4ef5013141757e9aace9afcc6f (patch) | |
| tree | 4dedbfa5f9619dd996f9eb5ee2c5826c44993478 /core/executable_internal.mk | |
| parent | 676e11fed82c5a4afb02d1082472fad14e625915 (diff) | |
| download | build-140761af09832e4ef5013141757e9aace9afcc6f.zip build-140761af09832e4ef5013141757e9aace9afcc6f.tar.gz build-140761af09832e4ef5013141757e9aace9afcc6f.tar.bz2 | |
Rename my_ndk_version_root to my_ndk_sysroot; and _include and _lib
prebuilts/ndk/current/platforms/android-19/arch-x86_64/usr/lib
is renamed to usr/lib64 to be more consistent with rest of
lib paths in x86_64 toolchain, which is multilib
See https://android-review.googlesource.com/#/c/92441/
Change-Id: I4e59245505d0fa87ae3608e81e715ccfcecc5ec8
Diffstat (limited to 'core/executable_internal.mk')
| -rw-r--r-- | core/executable_internal.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/executable_internal.mk b/core/executable_internal.mk index a7c3e86..c235a72 100644 --- a/core/executable_internal.mk +++ b/core/executable_internal.mk @@ -38,12 +38,12 @@ ifdef LOCAL_SDK_VERSION # so we don't have race condition when the system libraries (such as libc, libstdc++) are also built in the tree. my_target_global_ld_dirs := \ $(addprefix -L, $(patsubst %/,%,$(dir $(my_ndk_stl_shared_lib_fullpath))) \ - $(my_ndk_version_root)/usr/lib) \ + $(my_ndk_sysroot_lib)) \ $(my_target_global_ld_dirs) my_target_global_ldflags := $(my_ndk_stl_shared_lib) $(my_target_global_ldflags) -my_target_crtbegin_dynamic_o := $(wildcard $(my_ndk_version_root)/usr/lib/crtbegin_dynamic.o) -my_target_crtbegin_static_o := $(wildcard $(my_ndk_version_root)/usr/lib/crtbegin_static.o) -my_target_crtend_o := $(wildcard $(my_ndk_version_root)/usr/lib/crtend_android.o) +my_target_crtbegin_dynamic_o := $(wildcard $(my_ndk_sysroot_lib)/crtbegin_dynamic.o) +my_target_crtbegin_static_o := $(wildcard $(my_ndk_sysroot_lib)/crtbegin_static.o) +my_target_crtend_o := $(wildcard $(my_ndk_sysroot_lib)/crtend_android.o) endif $(linked_module): PRIVATE_TARGET_GLOBAL_LD_DIRS := $(my_target_global_ld_dirs) $(linked_module): PRIVATE_TARGET_GLOBAL_LDFLAGS := $(my_target_global_ldflags) |