commit 4b70d11dc00b163328c500b0061e9f956dd18903
author Dmitriy Ivanov <dimitry@google.com> Tue Oct 14 11:38:46 2014 -0700
committer Dmitriy Ivanov <dimitry@google.com> Mon Oct 20 09:53:23 2014 -0700
tree 276f9ab21fe0c5b08649ef0799e062ea9131c3af
parent 7f1fa9e802efa4cc6ded166ce090f7c33d5546ba

Untie gtest executables from LD_PRELOAD

Bug: 15345057
Bug: 15426766

(cherry picked from commit 8508a436efa7979ad54f644e60dad483c8499be2)

Change-Id: Id710c87c050f573fec1e4c36f06f88def5de5887

build/Android.gtest.mk

diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index a7d852b..bf9e9ec 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -278,7 +278,7 @@
 
 .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)
@@ -326,7 +326,7 @@
     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