Merge "Simplify catapult build"

am: 361fa3a8cb

Change-Id: I306659ddf2cb3217f273df347c4bf37ffcca5be9
This commit is contained in:
John Reck
2016-10-21 00:56:01 +00:00
committed by android-build-merger

View File

@@ -57,10 +57,7 @@ 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/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/catapult/ platform-tools/systrace/catapult/
external/chromium-trace/systrace.py platform-tools/systrace/systrace.py
external/chromium-trace/NOTICE platform-tools/systrace/NOTICE
external/chromium-trace/UPSTREAM_REVISION platform-tools/systrace/UPSTREAM_REVISION