diff options
| author | Ying Wang <wangying@google.com> | 2014-06-10 20:31:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-06-10 20:31:29 +0000 |
| commit | 69d57a89595c7c0fba7b7f7b7c6b431a92137215 (patch) | |
| tree | 3bca846143ccb79a6bad92cc6624e5346ccea899 /test | |
| parent | 5bf6a77944acdeb0a9464803c70d0c65cf15b68b (diff) | |
| parent | 07935e50194b61ead0f90553529f7e4b82c2d38d (diff) | |
| download | art-69d57a89595c7c0fba7b7f7b7c6b431a92137215.zip art-69d57a89595c7c0fba7b7f7b7c6b431a92137215.tar.gz art-69d57a89595c7c0fba7b7f7b7c6b431a92137215.tar.bz2 | |
Merge "Use HOST_LIBRARY_PATH to access host shared libraries."
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) |