diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2014-10-14 11:38:46 -0700 |
|---|---|---|
| committer | Dmitriy Ivanov <dimitry@google.com> | 2014-10-14 11:38:46 -0700 |
| commit | 8508a436efa7979ad54f644e60dad483c8499be2 (patch) | |
| tree | b06ba143b6f9c1f2bc43673cbd4b71b8a0b20144 /build | |
| parent | e4228d93de256c72df9d57f0def938b11cfe21a1 (diff) | |
| download | art-8508a436efa7979ad54f644e60dad483c8499be2.tar.gz art-8508a436efa7979ad54f644e60dad483c8499be2.tar.bz2 art-8508a436efa7979ad54f644e60dad483c8499be2.zip | |
Untie gtest executables from LD_PRELOAD
Bug: 15345057
Bug: 15426766
Change-Id: I053ddbacaf918405ce6b38a5ba0d623299c7b5c8
Diffstat (limited to 'build')
| -rw-r--r-- | build/Android.gtest.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk index af43a3c6d6..3e100e95ca 100644 --- a/build/Android.gtest.mk +++ b/build/Android.gtest.mk @@ -287,7 +287,7 @@ define define-art-gtest-rule-host .PHONY: $$(gtest_rule) $$(gtest_rule): $$(gtest_exe) $$(ART_GTEST_$(1)_HOST_DEPS) $(foreach file,$(ART_GTEST_$(1)_DEX_DEPS),$(ART_TEST_HOST_GTEST_$(file)_DEX)) $$(gtest_deps) - $(hide) ($$(call ART_TEST_SKIP,$$@) && LD_PRELOAD=libsigchain$$(ART_HOST_SHLIB_EXTENSION) $$< && $$(call ART_TEST_PASSED,$$@)) \ + $(hide) ($$(call ART_TEST_SKIP,$$@) && $$< && $$(call ART_TEST_PASSED,$$@)) \ || $$(call ART_TEST_FAILED,$$@) ART_TEST_HOST_GTEST$$($(2)ART_PHONY_TEST_HOST_SUFFIX)_RULES += $$(gtest_rule) @@ -335,7 +335,7 @@ define define-art-gtest LOCAL_MODULE_TAGS := tests endif LOCAL_CPP_EXTENSION := $$(ART_CPP_EXTENSION) - LOCAL_SRC_FILES := $$(art_gtest_filename) + LOCAL_SRC_FILES := $$(art_gtest_filename) sigchainlib/sigchain.cc LOCAL_C_INCLUDES += $$(ART_C_INCLUDES) art/runtime $$(art_gtest_extra_c_includes) LOCAL_SHARED_LIBRARIES += libartd $$(art_gtest_extra_shared_libraries) libart-gtest |