Support new Systrace dependencies

am: 1073602ff2

Change-Id: I80c5a235bcb02fa69f79dcfaa236d196dfcc5b7e
This commit is contained in:
Chris Craik
2016-08-22 22:59:53 +00:00
committed by android-build-merger
2 changed files with 7 additions and 5 deletions

View File

@@ -57,11 +57,12 @@ 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/catapult/systrace/systrace/ platform-tools/systrace/catapult/systrace/systrace/
external/chromium-trace/catapult/systrace/systrace/__init__.py platform-tools/systrace/catapult/systrace/systrace/__init__.py
external/chromium-trace/catapult/systrace/systrace/agents/__init__.py platform-tools/systrace/catapult/systrace/systrace/agents/__init__.py
external/chromium-trace/catapult/catapult_base/ platform-tools/systrace/catapult/catapult_base/
external/chromium-trace/catapult/common/ platform-tools/systrace/catapult/common/
external/chromium-trace/catapult/dependency_manager/ platform-tools/systrace/catapult/dependency_manager/
external/chromium-trace/catapult/devil/ platform-tools/systrace/catapult/devil/
external/chromium-trace/catapult/systrace/ platform-tools/systrace/catapult/systrace/
external/chromium-trace/systrace.py platform-tools/systrace/systrace.py
external/chromium-trace/systrace_trace_viewer.html platform-tools/systrace/systrace_trace_viewer.html
external/chromium-trace/NOTICE platform-tools/systrace/NOTICE
external/chromium-trace/UPSTREAM_REVISION platform-tools/systrace/UPSTREAM_REVISION

View File

@@ -20,7 +20,8 @@
-.*.swp
-.DS_Store
-*~
-_*
-_[!_]*
-*.pyc
-.*
-OWNERS
-MODULE_LICENSE_*