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

Side by Side Diff: build/common.gypi

Issue 1147013002: Set enable_hangouts_services_extension in build/common.gypi. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove comment Created 5 years, 7 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 | no next file » | 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 2376 matching lines...) Expand 10 before | Expand all | Expand 10 after
2387 'target_arch=="arm" or target_arch=="mipsel" or ' 2387 'target_arch=="arm" or target_arch=="mipsel" or '
2388 'target_arch=="arm64"))', { 2388 'target_arch=="arm64"))', {
2389 'use_seccomp_bpf%': 1, 2389 'use_seccomp_bpf%': 1,
2390 }, { 2390 }, {
2391 'use_seccomp_bpf%': 0, 2391 'use_seccomp_bpf%': 0,
2392 }], 2392 }],
2393 2393
2394 ['cfi_vptr==1 or cfi_derived_cast==1 or cfi_unrelated_cast==1', { 2394 ['cfi_vptr==1 or cfi_derived_cast==1 or cfi_unrelated_cast==1', {
2395 'use_lto%': 1, 2395 'use_lto%': 1,
2396 }], 2396 }],
2397
2398 ['branding=="Chrome" and buildtype=="Official"', {
2399 'enable_hangout_services_extension%': 1,
2400 }, {
2401 'enable_hangout_services_extension%': 0,
2402 }],
2397 ], 2403 ],
2398 2404
2399 # The path to the ANGLE library. 2405 # The path to the ANGLE library.
2400 'angle_path': '<(DEPTH)/third_party/angle', 2406 'angle_path': '<(DEPTH)/third_party/angle',
2401 2407
2402 # List of default apps to install in new profiles. The first list contains 2408 # List of default apps to install in new profiles. The first list contains
2403 # the source files as found in svn. The second list, used only for linux, 2409 # the source files as found in svn. The second list, used only for linux,
2404 # contains the destination location for each of the files. When a crx 2410 # contains the destination location for each of the files. When a crx
2405 # is added or removed from the list, the chrome/browser/resources/ 2411 # is added or removed from the list, the chrome/browser/resources/
2406 # default_apps/external_extensions.json file must also be updated. 2412 # default_apps/external_extensions.json file must also be updated.
(...skipping 3790 matching lines...) Expand 10 before | Expand all | Expand 10 after
6197 # settings in target dicts. SYMROOT is a special case, because many other 6203 # settings in target dicts. SYMROOT is a special case, because many other
6198 # Xcode variables depend on it, including variables such as 6204 # Xcode variables depend on it, including variables such as
6199 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6205 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6200 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6206 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6201 # files to appear (when present) in the UI as actual files and not red 6207 # files to appear (when present) in the UI as actual files and not red
6202 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6208 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6203 # and therefore SYMROOT, needs to be set at the project level. 6209 # and therefore SYMROOT, needs to be set at the project level.
6204 'SYMROOT': '<(DEPTH)/xcodebuild', 6210 'SYMROOT': '<(DEPTH)/xcodebuild',
6205 }, 6211 },
6206 } 6212 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698