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

Side by Side Diff: build/common.gypi

Issue 661983002: Revert "android_webview: go back to using system ICU." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git/+/master
Patch Set: Created 6 years, 2 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 1744 matching lines...) Expand 10 before | Expand all | Expand 10 after
1755 1755
1756 'p2p_apis%' : 0, 1756 'p2p_apis%' : 0,
1757 1757
1758 'gtest_target_type%': 'shared_library', 1758 'gtest_target_type%': 'shared_library',
1759 1759
1760 # Uses system APIs for decoding audio and video. 1760 # Uses system APIs for decoding audio and video.
1761 'use_libffmpeg%': '0', 1761 'use_libffmpeg%': '0',
1762 1762
1763 # When building as part of the Android system, use system libraries 1763 # When building as part of the Android system, use system libraries
1764 # where possible to reduce ROM size. 1764 # where possible to reduce ROM size.
1765 'use_system_icu%': '<(android_webview_build)',
1766 'use_system_stlport%': '<(android_webview_build)', 1765 'use_system_stlport%': '<(android_webview_build)',
1767 1766
1768 # Copy it out one scope. 1767 # Copy it out one scope.
1769 'android_webview_build%': '<(android_webview_build)', 1768 'android_webview_build%': '<(android_webview_build)',
1770 1769
1771 # Default android linker script for shared library exports. 1770 # Default android linker script for shared library exports.
1772 'android_linker_script%': '<(SHARED_INTERMEDIATE_DIR)/android_exports.ls t', 1771 'android_linker_script%': '<(SHARED_INTERMEDIATE_DIR)/android_exports.ls t',
1773 }], # OS=="android" 1772 }], # OS=="android"
1774 ['embedded==1', { 1773 ['embedded==1', {
1775 'use_system_fontconfig%': 0, 1774 'use_system_fontconfig%': 0,
(...skipping 3974 matching lines...) Expand 10 before | Expand all | Expand 10 after
5750 # settings in target dicts. SYMROOT is a special case, because many other 5749 # settings in target dicts. SYMROOT is a special case, because many other
5751 # Xcode variables depend on it, including variables such as 5750 # Xcode variables depend on it, including variables such as
5752 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5751 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5753 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5752 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5754 # files to appear (when present) in the UI as actual files and not red 5753 # files to appear (when present) in the UI as actual files and not red
5755 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5754 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5756 # and therefore SYMROOT, needs to be set at the project level. 5755 # and therefore SYMROOT, needs to be set at the project level.
5757 'SYMROOT': '<(DEPTH)/xcodebuild', 5756 'SYMROOT': '<(DEPTH)/xcodebuild',
5758 }, 5757 },
5759 } 5758 }
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