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 /Android.mk | |
| 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 'Android.mk')
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -97,7 +97,7 @@ include $(art_path)/sigchainlib/Android.mk # ART_HOST_DEPENDENCIES depends on Android.executable.mk above for ART_HOST_EXECUTABLES ART_HOST_DEPENDENCIES := $(ART_HOST_EXECUTABLES) $(HOST_OUT_JAVA_LIBRARIES)/core-libart-hostdex.jar -ART_HOST_DEPENDENCIES += $(HOST_OUT_SHARED_LIBRARIES)/libjavacore$(ART_HOST_SHLIB_EXTENSION) +ART_HOST_DEPENDENCIES += $(HOST_LIBRARY_PATH)/libjavacore$(ART_HOST_SHLIB_EXTENSION) ART_TARGET_DEPENDENCIES := $(ART_TARGET_EXECUTABLES) $(TARGET_OUT_JAVA_LIBRARIES)/core-libart.jar $(TARGET_OUT_SHARED_LIBRARIES)/libjavacore.so ifdef TARGET_2ND_ARCH ART_TARGET_DEPENDENCIES += $(2ND_TARGET_OUT_SHARED_LIBRARIES)/libjavacore.so @@ -166,7 +166,7 @@ test-art-host-interpreter: test-art-host-oat-interpreter test-art-host-run-test- @echo test-art-host-interpreter PASSED .PHONY: test-art-host-dependencies -test-art-host-dependencies: $(ART_HOST_TEST_DEPENDENCIES) $(HOST_OUT_SHARED_LIBRARIES)/libarttest$(ART_HOST_SHLIB_EXTENSION) $(HOST_CORE_DEX_LOCATIONS) +test-art-host-dependencies: $(ART_HOST_TEST_DEPENDENCIES) $(HOST_LIBRARY_PATH)/libarttest$(ART_HOST_SHLIB_EXTENSION) $(HOST_CORE_DEX_LOCATIONS) .PHONY: test-art-host-gtest test-art-host-gtest: $(ART_HOST_GTEST_TARGETS) |