LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 8ae499e1: Merge "Support new systrace file structure after switching to catapult"

Browse Source 
* commit '8ae499e1d3bf7915cd53b410eb8debda66595b86':
  Support new systrace file structure after switching to catapult
This commit is contained in:
Chris Craik
2015-09-02 17:23:20 +00:00
committed by Android Git Automerger
parent 0082138519 8ae499e1d3
commit 7126aedfb2
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
build/sdk.atree
View File

@@ -57,17 +57,17 @@ development/sdk/generated-api-versions.xml platform-tools/api/api-versions.xm
prebuilts/sdk/sdk-annotations/annotations.zip platform-tools/api/annotations.zip
# systrace
external/chromium-trace/agents/__init__.py platform-tools/systrace/agents/__init__.py
external/chromium-trace/agents/atrace_agent.py platform-tools/systrace/agents/atrace_agent.py
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_agent.py platform-tools/systrace/systrace_agent.py
external/chromium-trace/util.py platform-tools/systrace/util.py
external/chromium-trace/catapult/systrace/systrace/agents/__init__.py platform-tools/systrace/agents/__init__.py
external/chromium-trace/catapult/systrace/systrace/agents/atrace_agent.py platform-tools/systrace/agents/atrace_agent.py
external/chromium-trace/catapult/systrace/systrace/systrace.py platform-tools/systrace/systrace.py
external/chromium-trace/catapult/systrace/systrace/systrace-legacy.py platform-tools/systrace/systrace-legacy.py
external/chromium-trace/catapult/systrace/systrace/systrace_agent.py platform-tools/systrace/systrace_agent.py
external/chromium-trace/catapult/systrace/systrace/util.py platform-tools/systrace/util.py
external/chromium-trace/catapult/systrace/systrace/prefix.html platform-tools/systrace/prefix.html
external/chromium-trace/catapult/systrace/systrace/suffix.html platform-tools/systrace/suffix.html
external/chromium-trace/catapult/systrace/systrace/LICENSE platform-tools/systrace/LICENSE
external/chromium-trace/catapult/systrace/systrace/AUTHORS platform-tools/systrace/AUTHORS
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