commit 625dde7bdf6726b967733bb8b506734824cd6b5a
author Chris Craik <ccraik@android.com> Wed Apr 01 20:09:59 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Apr 01 20:09:59 2015 +0000
tree ac761c5355beeb986ced952072021c8beb7ba446
parent 2298d3b48d5bdbb1b6b3e1ea081fede26af7bae0
parent 630b075cdb4299e72d26d8cb355a28c342479201

am 630b075c: Merge "Fix build - support new systrace file structure"

* commit '630b075cdb4299e72d26d8cb355a28c342479201':
  Fix build - support new systrace file structure

build/sdk.atree

diff --git a/build/sdk.atree b/build/sdk.atree
index 269f4f9..bfdd8fd 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -54,16 +54,15 @@
 development/sdk/generated-api-versions.xml    platform-tools/api/api-versions.xml
 
 # systrace
-external/chromium-trace/systrace.py           platform-tools/systrace/systrace.py
-external/chromium-trace/systrace-legacy.py    platform-tools/systrace/systrace-legacy.py
-external/chromium-trace/script.js             platform-tools/systrace/script.js
-external/chromium-trace/style.css             platform-tools/systrace/style.css
-external/chromium-trace/prefix.html           platform-tools/systrace/prefix.html
-external/chromium-trace/suffix.html           platform-tools/systrace/suffix.html
-external/chromium-trace/LICENSE               platform-tools/systrace/LICENSE
-external/chromium-trace/AUTHORS               platform-tools/systrace/AUTHORS
-external/chromium-trace/NOTICE                platform-tools/systrace/NOTICE
-external/chromium-trace/UPSTREAM_REVISION     platform-tools/systrace/UPSTREAM_REVISION
+external/chromium-trace/systrace.py                   platform-tools/systrace/systrace.py
+external/chromium-trace/systrace-legacy.py            platform-tools/systrace/systrace-legacy.py
+external/chromium-trace/systrace_trace_viewer.html    platform-tools/systrace/systrace_trace_viewer.html
+external/chromium-trace/prefix.html                   platform-tools/systrace/prefix.html
+external/chromium-trace/suffix.html                   platform-tools/systrace/suffix.html
+external/chromium-trace/LICENSE                       platform-tools/systrace/LICENSE
+external/chromium-trace/AUTHORS                       platform-tools/systrace/AUTHORS
+external/chromium-trace/NOTICE                        platform-tools/systrace/NOTICE
+external/chromium-trace/UPSTREAM_REVISION             platform-tools/systrace/UPSTREAM_REVISION
 
 ##############################################################################
 # Build Tools Component