commit 803a8d73f1c8b3f331e2bbf2aba037f6c93d18dc
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jun 07 23:59:45 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 07 23:59:45 2018 +0000
tree 07ebf1fc2bb14861da0aa557d534e9074225eabd
parent 342e59c5a06b2eb449ae7ede3255e71a4464afaa
parent 9cb13a66863411e6e885fd387d7908844270f42f

Merge "Add debugging for b/62653020"

test/testrunner/env.py

diff --git a/test/testrunner/env.py b/test/testrunner/env.py
index 66ed0d0..1f4b829 100644
--- a/test/testrunner/env.py
+++ b/test/testrunner/env.py
@@ -140,3 +140,6 @@
 
 # include platform prebuilt java, javac, etc in $PATH.
 os.environ['PATH'] = ANDROID_JAVA_TOOLCHAIN + ':' + os.environ['PATH']
+
+DIST_DIR = _get_build_var('DIST_DIR')
+SOONG_OUT_DIR = _get_build_var('SOONG_OUT_DIR')

test/testrunner/testrunner.py

diff --git a/test/testrunner/testrunner.py b/test/testrunner/testrunner.py
index 2d1398e..044e8dc 100755
--- a/test/testrunner/testrunner.py
+++ b/test/testrunner/testrunner.py
@@ -52,6 +52,7 @@
 import multiprocessing
 import os
 import re
+import shutil
 import subprocess
 import sys
 import tempfile
@@ -1007,6 +1008,9 @@
     build_command += ' -C ' + env.ANDROID_BUILD_TOP
     build_command += ' ' + build_targets
     if subprocess.call(build_command.split()):
+      # Debugging for b/62653020
+      if env.DIST_DIR:
+        shutil.copyfile(env.SOONG_OUT_DIR + '/build.ninja', env.DIST_DIR + '/soong.ninja')
       sys.exit(1)
   if user_requested_tests:
     test_runner_thread = threading.Thread(target=run_tests, args=(user_requested_tests,))

tools/build/var_list

diff --git a/tools/build/var_list b/tools/build/var_list
index bb005cf..98a5472 100644
--- a/tools/build/var_list
+++ b/tools/build/var_list
@@ -34,3 +34,6 @@
 HOST_OUT_EXECUTABLES
 ANDROID_JAVA_TOOLCHAIN
 
+# b/62653020
+DIST_DIR
+SOONG_OUT_DIR