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

Side by Side Diff: trunk/src/chrome/chrome_common.gypi

Issue 19572012: Revert 212230 "Create top-level separate targets for browser and..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 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
« no previous file with comments | « trunk/src/chrome/chrome.gyp ('k') | trunk/src/chrome/chrome_dll.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'common', 8 'target_name': 'common',
9 'type': 'static_library', 9 'type': 'static_library',
10 'variables': { 10 'variables': {
(...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after
481 'common/worker_thread_ticker.cc', 481 'common/worker_thread_ticker.cc',
482 'common/worker_thread_ticker.h', 482 'common/worker_thread_ticker.h',
483 '../components/nacl/common/nacl_process_type.h', 483 '../components/nacl/common/nacl_process_type.h',
484 ], 484 ],
485 'conditions': [ 485 'conditions': [
486 ['enable_extensions==1', { 486 ['enable_extensions==1', {
487 'sources!': [ 487 'sources!': [
488 'common/extensions/api/extension_api_stub.cc', 488 'common/extensions/api/extension_api_stub.cc',
489 ], 489 ],
490 'dependencies': [ 490 'dependencies': [
491 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
492 '../device/usb/usb.gyp:device_usb', 491 '../device/usb/usb.gyp:device_usb',
493 ], 492 ],
494 }, { # enable_extensions == 0 493 }, { # enable_extensions == 0
495 'sources/': [ 494 'sources/': [
496 ['exclude', '^common/extensions/api/'], 495 ['exclude', '^common/extensions/api/'],
497 ['include', 'common/extensions/api/extension_api_stub.cc'], 496 ['include', 'common/extensions/api/extension_api_stub.cc'],
498 ['include', 'common/extensions/api/extension_action/action_info.cc'] , 497 ['include', 'common/extensions/api/extension_action/action_info.cc'] ,
499 ['include', 'common/extensions/api/extension_action/action_info.h'], 498 ['include', 'common/extensions/api/extension_action/action_info.h'],
500 ['include', 'common/extensions/api/extension_action/browser_action_h andler.cc'], 499 ['include', 'common/extensions/api/extension_action/browser_action_h andler.cc'],
501 ['include', 'common/extensions/api/extension_action/browser_action_h andler.h'], 500 ['include', 'common/extensions/api/extension_action/browser_action_h andler.h'],
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
836 'common/metrics/proto/user_action_event.proto', 835 'common/metrics/proto/user_action_event.proto',
837 ], 836 ],
838 'variables': { 837 'variables': {
839 'proto_in_dir': 'common/metrics/proto', 838 'proto_in_dir': 'common/metrics/proto',
840 'proto_out_dir': 'chrome/common/metrics/proto', 839 'proto_out_dir': 'chrome/common/metrics/proto',
841 }, 840 },
842 'includes': [ '../build/protoc.gypi' ], 841 'includes': [ '../build/protoc.gypi' ],
843 }, 842 },
844 ], 843 ],
845 } 844 }
OLDNEW
« no previous file with comments | « trunk/src/chrome/chrome.gyp ('k') | trunk/src/chrome/chrome_dll.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698