commit 8ae3588989ea99d8c60f885e3d830e6e0c87ff5f
author Hiroshi Yamauchi <yamauchi@google.com> Tue Jul 14 20:37:17 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 14 20:37:18 2015 +0000
tree d3394421dc7bb9a14480d051c0496316b3998a29
parent 34fcff08a9ecc981f5967b9cc8111a5fac555282
parent 093f1b4c3007d52a75186175d184ad7f58aaa0df

Merge "Add ART_TEST_DEBUG_GC to help with debugging gc."

build/Android.common_build.mk

diff --git a/build/Android.common_build.mk b/build/Android.common_build.mk
index 83dd690..5d4feb8 100644
--- a/build/Android.common_build.mk
+++ b/build/Android.common_build.mk
@@ -60,6 +60,11 @@
 $(info Enabling ART_BUILD_HOST_STATIC)
 endif
 
+ifeq ($(ART_TEST_DEBUG_GC),true)
+  ART_DEFAULT_GC_TYPE := SS
+  ART_USE_TLAB := true
+endif
+
 #
 # Used to enable JIT
 #

test/Android.run-test.mk

diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index ee6c2ef..13428ec 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -46,6 +46,10 @@
     $(JILL_JAR)
 endif
 
+ifeq ($(ART_TEST_DEBUG_GC),true)
+  ART_TEST_WITH_STRACE := true
+endif
+
 # Helper to create individual build targets for tests. Must be called with $(eval).
 # $(1): the test number
 define define-build-art-run-test