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

Side by Side Diff: build/common.gypi

Issue 22859018: Added image and button to privet notification (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@privet_notifications4
Patch Set: Updated to fix conflicts with master and remove binary files Created 7 years, 3 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
« no previous file with comments | « no previous file | chrome/app/generated_resources.grd » ('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 # 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 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 1607 matching lines...) Expand 10 before | Expand all | Expand 10 after
1618 }], 1618 }],
1619 ['enable_google_now==1', { 1619 ['enable_google_now==1', {
1620 'grit_defines': ['-D', 'enable_google_now'], 1620 'grit_defines': ['-D', 'enable_google_now'],
1621 }], 1621 }],
1622 ['use_concatenated_impulse_responses==1', { 1622 ['use_concatenated_impulse_responses==1', {
1623 'grit_defines': ['-D', 'use_concatenated_impulse_responses'], 1623 'grit_defines': ['-D', 'use_concatenated_impulse_responses'],
1624 }], 1624 }],
1625 ['enable_webrtc==1', { 1625 ['enable_webrtc==1', {
1626 'grit_defines': ['-D', 'enable_webrtc'], 1626 'grit_defines': ['-D', 'enable_webrtc'],
1627 }], 1627 }],
1628 ['enable_mdns==1', {
1629 'grit_defines': ['-D', 'enable_mdns'],
1630 }],
1628 ['clang_use_chrome_plugins==1 and OS!="win"', { 1631 ['clang_use_chrome_plugins==1 and OS!="win"', {
1629 'clang_chrome_plugins_flags': [ 1632 'clang_chrome_plugins_flags': [
1630 '<!@(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)' 1633 '<!@(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)'
1631 ], 1634 ],
1632 }], 1635 }],
1633 1636
1634 ['asan==1 and OS!="win"', { 1637 ['asan==1 and OS!="win"', {
1635 'clang%': 1, 1638 'clang%': 1,
1636 }], 1639 }],
1637 ['asan==1 and OS=="mac"', { 1640 ['asan==1 and OS=="mac"', {
(...skipping 3085 matching lines...) Expand 10 before | Expand all | Expand 10 after
4723 # settings in target dicts. SYMROOT is a special case, because many other 4726 # settings in target dicts. SYMROOT is a special case, because many other
4724 # Xcode variables depend on it, including variables such as 4727 # Xcode variables depend on it, including variables such as
4725 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4728 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4726 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4729 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4727 # files to appear (when present) in the UI as actual files and not red 4730 # files to appear (when present) in the UI as actual files and not red
4728 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4731 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4729 # and therefore SYMROOT, needs to be set at the project level. 4732 # and therefore SYMROOT, needs to be set at the project level.
4730 'SYMROOT': '<(DEPTH)/xcodebuild', 4733 'SYMROOT': '<(DEPTH)/xcodebuild',
4731 }, 4734 },
4732 } 4735 }
OLDNEW
« no previous file with comments | « no previous file | chrome/app/generated_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698