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

Side by Side Diff: build/common.gypi

Issue 570383002: android_webview: go back to using system ICU. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Manual revert Created 6 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 | « android_webview/libwebviewchromium.gypi ('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 1789 matching lines...) Expand 10 before | Expand all | Expand 10 after
1800 1800
1801 'p2p_apis%' : 0, 1801 'p2p_apis%' : 0,
1802 1802
1803 'gtest_target_type%': 'shared_library', 1803 'gtest_target_type%': 'shared_library',
1804 1804
1805 # Uses system APIs for decoding audio and video. 1805 # Uses system APIs for decoding audio and video.
1806 'use_libffmpeg%': '0', 1806 'use_libffmpeg%': '0',
1807 1807
1808 # When building as part of the Android system, use system libraries 1808 # When building as part of the Android system, use system libraries
1809 # where possible to reduce ROM size. 1809 # where possible to reduce ROM size.
1810 'use_system_icu%': '<(android_webview_build)',
1810 'use_system_stlport%': '<(android_webview_build)', 1811 'use_system_stlport%': '<(android_webview_build)',
1811 1812
1812 # Copy it out one scope. 1813 # Copy it out one scope.
1813 'android_webview_build%': '<(android_webview_build)', 1814 'android_webview_build%': '<(android_webview_build)',
1814 1815
1815 # Default android linker script for shared library exports. 1816 # Default android linker script for shared library exports.
1816 'android_linker_script%': '<(SHARED_INTERMEDIATE_DIR)/android_exports.ls t', 1817 'android_linker_script%': '<(SHARED_INTERMEDIATE_DIR)/android_exports.ls t',
1817 }], # OS=="android" 1818 }], # OS=="android"
1818 ['embedded==1', { 1819 ['embedded==1', {
1819 'use_system_fontconfig%': 0, 1820 'use_system_fontconfig%': 0,
(...skipping 3972 matching lines...) Expand 10 before | Expand all | Expand 10 after
5792 # settings in target dicts. SYMROOT is a special case, because many other 5793 # settings in target dicts. SYMROOT is a special case, because many other
5793 # Xcode variables depend on it, including variables such as 5794 # Xcode variables depend on it, including variables such as
5794 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5795 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5795 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5796 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5796 # files to appear (when present) in the UI as actual files and not red 5797 # files to appear (when present) in the UI as actual files and not red
5797 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5798 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5798 # and therefore SYMROOT, needs to be set at the project level. 5799 # and therefore SYMROOT, needs to be set at the project level.
5799 'SYMROOT': '<(DEPTH)/xcodebuild', 5800 'SYMROOT': '<(DEPTH)/xcodebuild',
5800 }, 5801 },
5801 } 5802 }
OLDNEW
« no previous file with comments | « android_webview/libwebviewchromium.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698