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

Side by Side Diff: build/common.gypi

Issue 183883025: Sync iOS DEPS overrides with downstream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Disable input_speech Created 6 years, 9 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 | « DEPS ('k') | 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 1340 matching lines...) Expand 10 before | Expand all | Expand 10 after
1351 }], 1351 }],
1352 ], 1352 ],
1353 }], # os_posix==1 and OS!="mac" and OS!="ios" 1353 }], # os_posix==1 and OS!="mac" and OS!="ios"
1354 ['OS=="mac"', { 1354 ['OS=="mac"', {
1355 'icu_use_data_file_flag%': 1, 1355 'icu_use_data_file_flag%': 1,
1356 }], # os=="mac" 1356 }], # os=="mac"
1357 ['OS=="ios"', { 1357 ['OS=="ios"', {
1358 'disable_nacl%': 1, 1358 'disable_nacl%': 1,
1359 'enable_background%': 0, 1359 'enable_background%': 0,
1360 'icu_use_data_file_flag%': 1, 1360 'icu_use_data_file_flag%': 1,
1361 'input_speech%': 0,
1361 'use_system_libxml%': 1, 1362 'use_system_libxml%': 1,
1362 'use_system_sqlite%': 1, 1363 'use_system_sqlite%': 1,
1363 'locales==': [ 1364 'locales==': [
1364 'ar', 'ca', 'cs', 'da', 'de', 'el', 'en-GB', 'en-US', 'es', 'es-MX', 1365 'ar', 'ca', 'cs', 'da', 'de', 'el', 'en-GB', 'en-US', 'es', 'es-MX',
1365 'fi', 'fr', 'he', 'hr', 'hu', 'id', 'it', 'ja', 'ko', 'ms', 'nb', 1366 'fi', 'fr', 'he', 'hr', 'hu', 'id', 'it', 'ja', 'ko', 'ms', 'nb',
1366 'nl', 'pl', 'pt', 'pt-PT', 'ro', 'ru', 'sk', 'sv', 'th', 'tr', 'uk', 1367 'nl', 'pl', 'pt', 'pt-PT', 'ro', 'ru', 'sk', 'sv', 'th', 'tr', 'uk',
1367 'vi', 'zh-CN', 'zh-TW', 1368 'vi', 'zh-CN', 'zh-TW',
1368 ], 1369 ],
1369 1370
1370 # The Mac SDK is set for iOS builds and passed through to Mac 1371 # The Mac SDK is set for iOS builds and passed through to Mac
(...skipping 3682 matching lines...) Expand 10 before | Expand all | Expand 10 after
5053 # settings in target dicts. SYMROOT is a special case, because many other 5054 # settings in target dicts. SYMROOT is a special case, because many other
5054 # Xcode variables depend on it, including variables such as 5055 # Xcode variables depend on it, including variables such as
5055 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5056 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5056 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5057 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5057 # files to appear (when present) in the UI as actual files and not red 5058 # files to appear (when present) in the UI as actual files and not red
5058 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5059 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5059 # and therefore SYMROOT, needs to be set at the project level. 5060 # and therefore SYMROOT, needs to be set at the project level.
5060 'SYMROOT': '<(DEPTH)/xcodebuild', 5061 'SYMROOT': '<(DEPTH)/xcodebuild',
5061 }, 5062 },
5062 } 5063 }
OLDNEW
« no previous file with comments | « DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698