diff options
| author | Yi Kong <yikong@google.com> | 2015-11-11 12:04:04 +0000 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2015-11-13 16:08:01 +0000 |
| commit | bc36a0f4d8194f9e3e79dde3b7d01098894535ee (patch) | |
| tree | 9a9a1b42881b98103536ea87b798c4af17425e00 /build/Android.gtest.mk | |
| parent | 4678b6bb31123076c2d921b20b52e52459d8b650 (diff) | |
| download | art-bc36a0f4d8194f9e3e79dde3b7d01098894535ee.tar.gz art-bc36a0f4d8194f9e3e79dde3b7d01098894535ee.tar.bz2 art-bc36a0f4d8194f9e3e79dde3b7d01098894535ee.zip | |
Build libxxavacore library for gtests
It is a dependency for exception_test, jni_compiler_test,
reflection_test and stub_test.
Change-Id: I0a4ed85762091617842901f9bd590d24fe39ec7b
Diffstat (limited to 'build/Android.gtest.mk')
| -rw-r--r-- | build/Android.gtest.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk index 69472b71e9..170a6fc39a 100644 --- a/build/Android.gtest.mk +++ b/build/Android.gtest.mk @@ -333,6 +333,7 @@ define define-art-gtest-rule-target $(foreach file,$(ART_GTEST_$(1)_DEX_DEPS),$(ART_TEST_TARGET_GTEST_$(file)_DEX)) \ $$(ART_TARGET_NATIVETEST_OUT)/$$(TARGET_$(2)ARCH)/$(1) \ $$($(2)TARGET_OUT_SHARED_LIBRARIES)/libjavacore.so \ + $$($(2)TARGET_OUT_SHARED_LIBRARIES)/libxxavacore.so \ $$(TARGET_OUT_JAVA_LIBRARIES)/core-libart.jar .PHONY: $$(gtest_rule) @@ -374,7 +375,8 @@ define define-art-gtest-rule-host gtest_exe := $$(HOST_OUT_EXECUTABLES)/$(1)$$($(2)ART_PHONY_TEST_HOST_SUFFIX) # Dependencies for all host gtests. gtest_deps := $$(HOST_CORE_DEX_LOCATIONS) \ - $$($(2)ART_HOST_OUT_SHARED_LIBRARIES)/libjavacore$$(ART_HOST_SHLIB_EXTENSION) + $$($(2)ART_HOST_OUT_SHARED_LIBRARIES)/libjavacore$$(ART_HOST_SHLIB_EXTENSION) \ + $$($(2)ART_HOST_OUT_SHARED_LIBRARIES)/libxxavacore$$(ART_HOST_SHLIB_EXTENSION) .PHONY: $$(gtest_rule) |