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

Side by Side Diff: chrome/chrome_browser.gypi

Issue 11226060: RLZ: remove hard-coded Win || Mac conditions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge Created 8 years, 1 month 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 | « chrome/browser/rlz/rlz_extension_api.h ('k') | chrome/chrome_tests.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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 { 6 {
7 'targets': [ 7 'targets': [
8 { 8 {
9 'target_name': 'browser', 9 'target_name': 'browser',
10 'type': 'static_library', 10 'type': 'static_library',
(...skipping 2635 matching lines...) Expand 10 before | Expand all | Expand 10 after
2646 'sources': [ 2646 'sources': [
2647 # Build the necessary GTM sources 2647 # Build the necessary GTM sources
2648 '../third_party/GTM/Foundation/GTMServiceManagement.h', 2648 '../third_party/GTM/Foundation/GTMServiceManagement.h',
2649 '../third_party/GTM/Foundation/GTMServiceManagement.c', 2649 '../third_party/GTM/Foundation/GTMServiceManagement.c',
2650 ], 2650 ],
2651 'include_dirs': [ 2651 'include_dirs': [
2652 '../third_party/GTM', 2652 '../third_party/GTM',
2653 '../third_party/GTM/Foundation', 2653 '../third_party/GTM/Foundation',
2654 ], 2654 ],
2655 }], 2655 }],
2656 ['OS=="win" or OS=="mac"', { 2656 ['enable_rlz==1', {
2657 'dependencies': [ 2657 'dependencies': [
2658 '../rlz/rlz.gyp:rlz_lib', 2658 '../rlz/rlz.gyp:rlz_lib',
2659 ], 2659 ],
2660 }, { # 'OS!="win" and OS!="mac" 2660 }, { # enable_rlz!=1
2661 'sources/': [ 2661 'sources/': [
2662 # Exclude all of rlz. 2662 # Exclude all of rlz.
2663 ['exclude', '^browser/rlz/'], 2663 ['exclude', '^browser/rlz/'],
2664 ], 2664 ],
2665 }], 2665 }],
2666 ['OS=="win"', { 2666 ['OS=="win"', {
2667 'include_dirs': [ 2667 'include_dirs': [
2668 '<(DEPTH)/third_party/wtl/include', 2668 '<(DEPTH)/third_party/wtl/include',
2669 ], 2669 ],
2670 'dependencies': [ 2670 'dependencies': [
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
2955 'proto_in_dir': '../third_party/cros_system_api/dbus', 2955 'proto_in_dir': '../third_party/cros_system_api/dbus',
2956 'proto_out_dir': 'chrome/browser/media_transfer_protocol', 2956 'proto_out_dir': 'chrome/browser/media_transfer_protocol',
2957 }, 2957 },
2958 'includes': ['../build/protoc.gypi'], 2958 'includes': ['../build/protoc.gypi'],
2959 }, 2959 },
2960 ], 2960 ],
2961 }, 2961 },
2962 ], 2962 ],
2963 ], 2963 ],
2964 } 2964 }
OLDNEW
« no previous file with comments | « chrome/browser/rlz/rlz_extension_api.h ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698