diff options
| author | Ying Wang <wangying@google.com> | 2014-06-10 12:06:16 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-06-10 12:06:16 -0700 |
| commit | 07935e50194b61ead0f90553529f7e4b82c2d38d (patch) | |
| tree | 7a169db76f62a59be5c0d7704f149dd31e65afbe /test | |
| parent | 335b91fb98d8004580e9a58335a873a1874fa5a5 (diff) | |
| download | art-07935e50194b61ead0f90553529f7e4b82c2d38d.zip art-07935e50194b61ead0f90553529f7e4b82c2d38d.tar.gz art-07935e50194b61ead0f90553529f7e4b82c2d38d.tar.bz2 | |
Use HOST_LIBRARY_PATH to access host shared libraries.
With multilib host build, the build system installs host
shared libraries to different directories depending on a
library's bitness:
- HOST_OUT_SHARED_LIBRARIES points to the library path of 64-bit;
- 2ND_HOST_OUT_SHARED_LIBRARIES points to the library path of 32-bit;
- If you don't care the bitness of the libraries and just want whatever
version the librareies are built by default, use HOST_LIBRARY_PATH.
Bug:13751317
Change-Id: I58a7ca5988d89b8619a804913461723719c9a873
Diffstat (limited to 'test')
| -rw-r--r-- | test/Android.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/Android.mk b/test/Android.mk index c15259c..109382d 100644 --- a/test/Android.mk +++ b/test/Android.mk @@ -143,8 +143,8 @@ test-art-host-oat-default-$(1): $(HOST_OUT_JAVA_LIBRARIES)/$(ART_HOST_ARCH)/oat- mkdir -p /tmp/android-data/test-art-host-oat-default-$(1) ANDROID_DATA=/tmp/android-data/test-art-host-oat-default-$(1) \ ANDROID_ROOT=$(HOST_OUT) \ - LD_LIBRARY_PATH=$(HOST_OUT_SHARED_LIBRARIES) \ - $(HOST_OUT_EXECUTABLES)/dalvikvm $(DALVIKVM_FLAGS) -XXlib:libartd.so -Ximage:$(HOST_CORE_IMG_LOCATION) -classpath $(HOST_OUT_JAVA_LIBRARIES)/oat-test-dex-$(1).jar -Djava.library.path=$(HOST_OUT_SHARED_LIBRARIES) $(1) $(2) \ + LD_LIBRARY_PATH=$(HOST_LIBRARY_PATH) \ + $(HOST_OUT_EXECUTABLES)/dalvikvm $(DALVIKVM_FLAGS) -XXlib:libartd.so -Ximage:$(HOST_CORE_IMG_LOCATION) -classpath $(HOST_OUT_JAVA_LIBRARIES)/oat-test-dex-$(1).jar -Djava.library.path=$(HOST_LIBRARY_PATH) $(1) $(2) \ && echo test-art-host-oat-default-$(1) PASSED || (echo test-art-host-oat-default-$(1) FAILED && exit 1) $(hide) rm -r /tmp/android-data/test-art-host-oat-default-$(1) @@ -153,8 +153,8 @@ test-art-host-oat-interpreter-$(1): $(HOST_OUT_JAVA_LIBRARIES)/$(ART_HOST_ARCH)/ mkdir -p /tmp/android-data/test-art-host-oat-interpreter-$(1) ANDROID_DATA=/tmp/android-data/test-art-host-oat-interpreter-$(1) \ ANDROID_ROOT=$(HOST_OUT) \ - LD_LIBRARY_PATH=$(HOST_OUT_SHARED_LIBRARIES) \ - $(HOST_OUT_EXECUTABLES)/dalvikvm -XXlib:libartd.so -Ximage:$(HOST_CORE_IMG_LOCATION) $(DALVIKVM_FLAGS) -Xint -classpath $(HOST_OUT_JAVA_LIBRARIES)/oat-test-dex-$(1).jar -Djava.library.path=$(HOST_OUT_SHARED_LIBRARIES) $(1) $(2) \ + LD_LIBRARY_PATH=$(HOST_LIBRARY_PATH) \ + $(HOST_OUT_EXECUTABLES)/dalvikvm -XXlib:libartd.so -Ximage:$(HOST_CORE_IMG_LOCATION) $(DALVIKVM_FLAGS) -Xint -classpath $(HOST_OUT_JAVA_LIBRARIES)/oat-test-dex-$(1).jar -Djava.library.path=$(HOST_LIBRARY_PATH) $(1) $(2) \ && echo test-art-host-oat-interpreter-$(1) PASSED || (echo test-art-host-oat-interpreter-$(1) FAILED && exit 1) $(hide) rm -r /tmp/android-data/test-art-host-oat-interpreter-$(1) |