commit 1cae4d538d01959c4912c10e735e341f63cd268d
author Isabelle Taylor <taylori@google.com> Tue Oct 02 10:23:18 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 02 10:23:18 2018 +0000
tree 4476c179783ca7b6ad7c46c6c14876af8feb965e
parent 121ad83c50b6a1da1a8b1e89055aba669e61a665
parent 54ce70581abcf3e8914e14f3e94655d34ef0d64e

Merge "trace_processor: Parse SysStats trace events and add to counters table"

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index fcb7192..0603419 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -66,11 +66,13 @@
       sudo: false
       compiler: clang
       env: CFG=linux_trusty-clang-x86_64-msan GN_ARGS="is_debug=false is_msan=true"
-    - os: linux
-      dist: trusty
-      sudo: true
-      compiler: clang
-      env: CFG=linux_trusty-clang-x86_64-ubsan_asan_lsan GN_ARGS="is_debug=false is_ubsan=true is_asan=true is_lsan=true"
+# TODO(b/117093687): This always times out in Travis.
+# Re-enable once that is fixed.
+#    - os: linux
+#      dist: trusty
+#      sudo: true
+#      compiler: clang
+#      env: CFG=linux_trusty-clang-x86_64-ubsan_asan_lsan GN_ARGS="is_debug=false is_ubsan=true is_asan=true is_lsan=true"
     - os: linux
       dist: trusty
       sudo: false

buildtools/.gitignore

diff --git a/buildtools/.gitignore b/buildtools/.gitignore
index 1dd47b9..f33608c 100644
--- a/buildtools/.gitignore
+++ b/buildtools/.gitignore
@@ -1,3 +1,4 @@
+android-core/
 android_sdk/
 aosp-*/
 benchmark/
@@ -10,15 +11,15 @@
 libbacktrace/
 libcxx/
 libcxxabi/
+libfuzzer/
 libunwind/
 linenoise/
 linux/
 linux64/
+lzma/
 mac/
 ndk/
 nodejs/
 protobuf/
 sqlite/
-android-core/
-lzma/
 test_data/