Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(103)

Side by Side Diff: chrome/chrome_common.gypi

Issue 334273003: Move //chrome/common/metrics/proto to //chrome/browser/metrics/variations/proto. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chrome_common_sources': [ 7 'chrome_common_sources': [
8 '../apps/app_shim/app_shim_launch.h', 8 '../apps/app_shim/app_shim_launch.h',
9 '../apps/app_shim/app_shim_messages.h', 9 '../apps/app_shim/app_shim_messages.h',
10 'common/all_messages.h', 10 'common/all_messages.h',
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
281 '..', 281 '..',
282 ], 282 ],
283 }, 283 },
284 'dependencies': [ 284 'dependencies': [
285 # TODO(gregoryd): chrome_resources and chrome_strings could be 285 # TODO(gregoryd): chrome_resources and chrome_strings could be
286 # shared with the 64-bit target, but it does not work due to a gyp 286 # shared with the 64-bit target, but it does not work due to a gyp
287 # issue. 287 # issue.
288 'common_net', 288 'common_net',
289 'common_version', 289 'common_version',
290 'installer_util', 290 'installer_util',
291 'metrics_proto',
292 '<(DEPTH)/base/base.gyp:base', 291 '<(DEPTH)/base/base.gyp:base',
293 '<(DEPTH)/base/base.gyp:base_i18n', 292 '<(DEPTH)/base/base.gyp:base_i18n',
294 '<(DEPTH)/base/base.gyp:base_prefs', 293 '<(DEPTH)/base/base.gyp:base_prefs',
295 '<(DEPTH)/base/base.gyp:base_static', 294 '<(DEPTH)/base/base.gyp:base_static',
296 '<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources', 295 '<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources',
297 '<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings', 296 '<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings',
298 '<(DEPTH)/chrome/chrome_resources.gyp:theme_resources', 297 '<(DEPTH)/chrome/chrome_resources.gyp:theme_resources',
299 '<(DEPTH)/chrome/common_constants.gyp:common_constants', 298 '<(DEPTH)/chrome/common_constants.gyp:common_constants',
300 '<(DEPTH)/components/components.gyp:cloud_devices_common', 299 '<(DEPTH)/components/components.gyp:cloud_devices_common',
301 '<(DEPTH)/components/components.gyp:json_schema', 300 '<(DEPTH)/components/components.gyp:json_schema',
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
506 ['OS == "ios"', { 505 ['OS == "ios"', {
507 'sources/': [ 506 'sources/': [
508 # Pull in specific Mac files for iOS (which have been filtered out 507 # Pull in specific Mac files for iOS (which have been filtered out
509 # by file name rules). 508 # by file name rules).
510 ['include', '^common/chrome_version_info_mac\\.mm$'], 509 ['include', '^common/chrome_version_info_mac\\.mm$'],
511 ], 510 ],
512 }], 511 }],
513 ], 512 ],
514 'export_dependent_settings': [ 513 'export_dependent_settings': [
515 '../base/base.gyp:base', 514 '../base/base.gyp:base',
516 'metrics_proto',
517 ], 515 ],
518 }, 516 },
519 { 517 {
520 'target_name': 'common_version', 518 'target_name': 'common_version',
521 'type': 'none', 519 'type': 'none',
522 'conditions': [ 520 'conditions': [
523 ['os_posix == 1 and OS != "mac" and OS != "ios"', { 521 ['os_posix == 1 and OS != "mac" and OS != "ios"', {
524 'direct_dependent_settings': { 522 'direct_dependent_settings': {
525 'include_dirs': [ 523 'include_dirs': [
526 '<(SHARED_INTERMEDIATE_DIR)', 524 '<(SHARED_INTERMEDIATE_DIR)',
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
667 'common/safe_browsing/client_model.proto', 665 'common/safe_browsing/client_model.proto',
668 'common/safe_browsing/crx_info.proto', 666 'common/safe_browsing/crx_info.proto',
669 'common/safe_browsing/csd.proto' 667 'common/safe_browsing/csd.proto'
670 ], 668 ],
671 'variables': { 669 'variables': {
672 'proto_in_dir': 'common/safe_browsing', 670 'proto_in_dir': 'common/safe_browsing',
673 'proto_out_dir': 'chrome/common/safe_browsing', 671 'proto_out_dir': 'chrome/common/safe_browsing',
674 }, 672 },
675 'includes': [ '../build/protoc.gypi' ], 673 'includes': [ '../build/protoc.gypi' ],
676 }, 674 },
677 {
678 # Protobuf compiler / generator for UMA (User Metrics Analysis).
679
680 # GN version: //chrome/common/metrics/proto:proto
681 'target_name': 'metrics_proto',
682 'type': 'static_library',
683 'sources': [
684 'common/metrics/proto/chrome_experiments.proto',
685 ],
686 'variables': {
687 'proto_in_dir': 'common/metrics/proto',
688 'proto_out_dir': 'chrome/common/metrics/proto',
689 },
690 'includes': [ '../build/protoc.gypi' ],
691 },
692 ], 675 ],
693 } 676 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698