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

Side by Side Diff: build/common.gypi

Issue 156333002: Enable icu_use_data_file_flag on Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: copy icudtl.dat to assets directory to be included in apk Created 6 years, 10 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
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 1289 matching lines...) Expand 10 before | Expand all | Expand 10 after
1300 }], 1300 }],
1301 # All Chrome builds have breakpad symbols, but only process the 1301 # All Chrome builds have breakpad symbols, but only process the
1302 # symbols from official builds. 1302 # symbols from official builds.
1303 ['(branding=="Chrome" and buildtype=="Official")', { 1303 ['(branding=="Chrome" and buildtype=="Official")', {
1304 'linux_dump_symbols%': 1, 1304 'linux_dump_symbols%': 1,
1305 1305
1306 # Omit unwind support in official release builds to save space. We 1306 # Omit unwind support in official release builds to save space. We
1307 # can use breakpad for these builds. 1307 # can use breakpad for these builds.
1308 'release_unwind_tables%': 0, 1308 'release_unwind_tables%': 0,
1309 }], 1309 }],
1310 # TODO(jungshik): Turn this on on Android and Chrome OS 1310 # TODO(jshin): Turn this on on CrOS
1311 ['OS!="android" and chromeos==0', { 1311 # Should we also disable this when use_system_icu==1 on Linux?
1312 ['chromeos==0 and android_webview_build==0', {
1312 'icu_use_data_file_flag%': 1, 1313 'icu_use_data_file_flag%': 1,
1313 }], 1314 }],
1314 ], 1315 ],
1315 }], # os_posix==1 and OS!="mac" and OS!="ios" 1316 }], # os_posix==1 and OS!="mac" and OS!="ios"
1316 ['OS=="mac"', { 1317 ['OS=="mac"', {
1317 'icu_use_data_file_flag%': 1, 1318 'icu_use_data_file_flag%': 1,
1318 }], # os=="mac" 1319 }], # os=="mac"
1319 ['OS=="ios"', { 1320 ['OS=="ios"', {
1320 'disable_nacl%': 1, 1321 'disable_nacl%': 1,
1321 'enable_background%': 0, 1322 'enable_background%': 0,
(...skipping 3572 matching lines...) Expand 10 before | Expand all | Expand 10 after
4894 # settings in target dicts. SYMROOT is a special case, because many other 4895 # settings in target dicts. SYMROOT is a special case, because many other
4895 # Xcode variables depend on it, including variables such as 4896 # Xcode variables depend on it, including variables such as
4896 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4897 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4897 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4898 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4898 # files to appear (when present) in the UI as actual files and not red 4899 # files to appear (when present) in the UI as actual files and not red
4899 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4900 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4900 # and therefore SYMROOT, needs to be set at the project level. 4901 # and therefore SYMROOT, needs to be set at the project level.
4901 'SYMROOT': '<(DEPTH)/xcodebuild', 4902 'SYMROOT': '<(DEPTH)/xcodebuild',
4902 }, 4903 },
4903 } 4904 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698