commit 464ecc22c39ff9f4b43951007286a8507a08c50f
author Vladimir Marko <vmarko@google.com> Fri Jun 02 12:55:56 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jun 02 12:55:56 2017 +0000
tree 3dc3fa7986cf9779655790626608921621a6b333
parent ab0ebad5dc6deb69f57062dae26601c11a599cc2
parent e5d9fea0f415fa1017d386991990662610eb236f

Merge "Delay allocating environment locations." am: 9b70b4a806 am: 3c36d0a59b
am: e5d9fea0f4

Change-Id: I2c4ac90e49a249414512c534f106f33d829e43f2

runtime/thread_list.cc

diff --git a/runtime/thread_list.cc b/runtime/thread_list.cc
index ca8f7b6..2657362 100644
--- a/runtime/thread_list.cc
+++ b/runtime/thread_list.cc
@@ -757,7 +757,7 @@
         // EAGAIN and EINTR both indicate a spurious failure, try again from the beginning.
         if ((errno != EAGAIN) && (errno != EINTR)) {
           if (errno == ETIMEDOUT) {
-            LOG(::android::base::FATAL)
+            LOG(kIsDebugBuild ? ::android::base::FATAL : ::android::base::ERROR)
                 << "Timed out waiting for threads to suspend, waited for "
                 << PrettyDuration(NanoTime() - start_time);
           } else {

test/etc/run-test-jar

diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index ca52a99..5d5d165 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -616,6 +616,8 @@
     vdex_cmdline="${dex2oat_cmdline} ${VDEX_FILTER} --input-vdex=$DEX_LOCATION/oat/$ISA/$TEST_NAME.vdex --output-vdex=$DEX_LOCATION/oat/$ISA/$TEST_NAME.vdex"
   elif [ "$TEST_VDEX" = "y" ]; then
     vdex_cmdline="${dex2oat_cmdline} ${VDEX_FILTER} --input-vdex=$DEX_LOCATION/oat/$ISA/$TEST_NAME.vdex"
+  elif [ "$PROFILE" = "y" ] || [ "$RANDOM_PROFILE" = "y" ]; then
+    vdex_cmdline="${dex2oat_cmdline} --input-vdex=$DEX_LOCATION/oat/$ISA/$TEST_NAME.vdex --output-vdex=$DEX_LOCATION/oat/$ISA/$TEST_NAME.vdex"
   fi
 fi