diff options
| author | nednguyen <nednguyen@google.com> | 2016-01-26 17:39:28 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-27 01:40:55 +0000 |
| commit | c42bf9152ace37475c1149ec57ffe2838671085b (patch) | |
| tree | e0372c983f49727a60a09788551ad9bdf6159fbd /build | |
| parent | 1305f726bd299d30b0206bdd787eda473be7cce3 (diff) | |
| download | chromium_src-c42bf9152ace37475c1149ec57ffe2838671085b.zip chromium_src-c42bf9152ace37475c1149ec57ffe2838671085b.tar.gz chromium_src-c42bf9152ace37475c1149ec57ffe2838671085b.tar.bz2 | |
Update references to tools/telemetry in .gn, .gyp & .isolate files
Now that tools/telemetry is moved to catapult/ repo
(https://github.com/catapult-project/catapult/commit/40afc53353daf28b955397c8e27d6f1de7bb10b6), we will soon remove tools/telemetry/.
This patch update the reference to telemetry/ in .gn, .gyp & .isolate files
BUG=478864
TEST=patch set 1 delete telemetry/telemetry.gyp, telemetry/BUILD.gn & telemetry/telemetry.isolate, CQ shows that all bots are green.
Review URL: https://codereview.chromium.org/1638483002
Cr-Commit-Position: refs/heads/master@{#371681}
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 20 | ||||
| -rw-r--r-- | build/android/android.isolate | 1 | ||||
| -rw-r--r-- | build/gn_migration.gypi | 4 |
3 files changed, 12 insertions, 13 deletions
diff --git a/build/all.gyp b/build/all.gyp index 7791013..6f1aba9 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -82,7 +82,7 @@ '../content/content_shell_and_tests.gyp:content_shell_apk', '<@(android_app_targets)', 'android_builder_tests', - '../tools/telemetry/telemetry.gyp:*#host', + '../third_party/catapult/telemetry/telemetry.gyp:*#host', # TODO(nyquist) This should instead by a target for sync when all of # the sync-related code for Android has been upstreamed. # See http://crbug.com/159203 @@ -141,6 +141,7 @@ '../ppapi/tools/ppapi_tools.gyp:*', '../skia/skia.gyp:*', '../sync/tools/sync_tools.gyp:*', + '../third_party/catapult/telemetry/telemetry.gyp:*', '../third_party/WebKit/public/all.gyp:*', '../third_party/cacheinvalidation/cacheinvalidation.gyp:*', '../third_party/codesighs/codesighs.gyp:*', @@ -159,7 +160,6 @@ '../third_party/qcms/qcms.gyp:*', '../tools/gn/gn.gyp:*', '../tools/perf/clear_system_cache/clear_system_cache.gyp:*', - '../tools/telemetry/telemetry.gyp:*', '../v8/tools/gyp/v8.gyp:*', '<(libjpeg_gyp_path):*', ], @@ -362,12 +362,12 @@ '../mojo/mojo.gyp:mojo', '../ppapi/ppapi_internal.gyp:ppapi_unittests', '../remoting/remoting.gyp:remoting_unittests', + '../third_party/catapult/telemetry/telemetry.gyp:*', '../third_party/WebKit/public/all.gyp:all_blink', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', '../third_party/leveldatabase/leveldatabase.gyp:env_chromium_unittests', '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_unittests', '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests', - '../tools/telemetry/telemetry.gyp:*', ], }], ['OS!="ios" and OS!="android" and chromecast==0', { @@ -581,7 +581,7 @@ '../media/media.gyp:media_perftests', '../media/midi/midi.gyp:midi_unittests', '../tools/perf/clear_system_cache/clear_system_cache.gyp:*', - '../tools/telemetry/telemetry.gyp:*', + '../third_party/catapult/telemetry/telemetry.gyp:*', ], 'conditions': [ ['OS!="ios" and OS!="win"', { @@ -620,7 +620,7 @@ '../gpu/gpu.gyp:gl_tests', '../gpu/gpu.gyp:angle_unittests', '../gpu/gpu.gyp:gpu_unittests', - '../tools/telemetry/telemetry.gyp:*', + '../third_party/catapult/telemetry/telemetry.gyp:*', ], 'conditions': [ ['OS!="ios" and OS!="win"', { @@ -657,7 +657,7 @@ '../gpu/gpu.gyp:gl_tests', '../gpu/gpu.gyp:angle_unittests', '../gpu/gpu.gyp:gpu_unittests', - '../tools/telemetry/telemetry.gyp:*', + '../third_party/catapult/telemetry/telemetry.gyp:*', ], 'conditions': [ ['OS!="ios" and OS!="win"', { @@ -953,7 +953,7 @@ '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_unittests', '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests', '../tools/perf/clear_system_cache/clear_system_cache.gyp:*', - '../tools/telemetry/telemetry.gyp:*', + '../third_party/catapult/telemetry/telemetry.gyp:*', '../ui/base/ui_base_tests.gyp:ui_base_unittests', '../ui/gfx/gfx_tests.gyp:gfx_unittests', '../ui/gl/gl_tests.gyp:gl_unittests', @@ -993,7 +993,7 @@ '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_unittests', '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests', '../tools/perf/clear_system_cache/clear_system_cache.gyp:*', - '../tools/telemetry/telemetry.gyp:*', + '../third_party/catapult/telemetry/telemetry.gyp:*', '../ui/base/ui_base_tests.gyp:ui_base_unittests', '../ui/gfx/gfx_tests.gyp:gfx_unittests', '../ui/gl/gl_tests.gyp:gl_unittests', @@ -1100,7 +1100,7 @@ '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_unittests', '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests', '../tools/perf/clear_system_cache/clear_system_cache.gyp:*', - '../tools/telemetry/telemetry.gyp:*', + '../third_party/catapult/telemetry/telemetry.gyp:*', '../ui/base/ui_base_tests.gyp:ui_base_unittests', '../ui/events/events_unittests.gyp:events_unittests', '../ui/gfx/gfx_tests.gyp:gfx_unittests', @@ -1288,7 +1288,7 @@ '../sandbox/sandbox.gyp:chrome_sandbox', '../sandbox/sandbox.gyp:sandbox_linux_unittests', '../third_party/mesa/mesa.gyp:osmesa', - '../tools/telemetry/telemetry.gyp:bitmaptools#host', + '../third_party/catapult/telemetry/telemetry.gyp:bitmaptools#host', '../tools/perf/clear_system_cache/clear_system_cache.gyp:clear_system_cache', ], 'conditions': [ diff --git a/build/android/android.isolate b/build/android/android.isolate index 4db7646..bada53c 100644 --- a/build/android/android.isolate +++ b/build/android/android.isolate @@ -11,7 +11,6 @@ '../../third_party/catapult/', '../../third_party/requests/', '../../tools/swarming_client/', - '../../tools/telemetry/telemetry/', '<(PRODUCT_DIR)/icudtl.dat', '<(PRODUCT_DIR)/lib.java/chromium_commands.dex.jar', '<(PRODUCT_DIR)/host_forwarder', diff --git a/build/gn_migration.gypi b/build/gn_migration.gypi index 99b543d..2af02ba 100644 --- a/build/gn_migration.gypi +++ b/build/gn_migration.gypi @@ -87,7 +87,7 @@ '../third_party/leveldatabase/leveldatabase.gyp:env_chromium_unittests', '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_unittests', '../third_party/smhasher/smhasher.gyp:pmurhash', - '../tools/telemetry/telemetry.gyp:bitmaptools#host', + '../third_party/catapult/telemetry/telemetry.gyp:bitmaptools#host', '../ui/accessibility/accessibility.gyp:accessibility_unittests', '../ui/base/ui_base_tests.gyp:ui_base_unittests', '../ui/display/display.gyp:display_unittests', @@ -233,7 +233,7 @@ '../tools/android/heap_profiler/heap_profiler.gyp:heap_profiler_unittests_apk', '../tools/android/android_tools.gyp:memconsumer', '../tools/imagediff/image_diff.gyp:image_diff#host', - '../tools/telemetry/telemetry.gyp:bitmaptools#host', + '../third_party/catapult/telemetry/telemetry.gyp:bitmaptools#host', '../ui/android/ui_android.gyp:ui_android_unittests_apk', '../ui/android/ui_android.gyp:ui_junit_tests', '../ui/base/ui_base_tests.gyp:ui_base_unittests_apk', |
