summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSiva Velusamy <vsiva@google.com>2013-07-22 20:53:50 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-07-22 20:53:51 +0000
commit31cc1650cf4509d0b5e4c236f28b2e7620104e42 (patch)
tree3654dee7b8cabca2470c3e488a6789c397125061
parent19dd9d200cc6783b468c4392a724dc1dd1f15523 (diff)
parent28f992a9cd9f754cdf5415faac0e7d1d6013a1d9 (diff)
downloadandroid_development-31cc1650cf4509d0b5e4c236f28b2e7620104e42.tar.gz
android_development-31cc1650cf4509d0b5e4c236f28b2e7620104e42.tar.bz2
android_development-31cc1650cf4509d0b5e4c236f28b2e7620104e42.zip
Merge "Release systrace into platform-tools" into jb-mr2-dev
-rw-r--r--build/sdk.atree11
1 files changed, 11 insertions, 0 deletions
diff --git a/build/sdk.atree b/build/sdk.atree
index 59dc6fdf3..a2756535a 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -48,6 +48,17 @@ bin/fastboot strip platform-tools/fastboot
# API database for tools such as lint
development/sdk/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
##############################################################################
# Build Tools Component