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

Side by Side Diff: trunk/src/build/common.gypi

Issue 200033005: Revert 258062 "Turns on use_mojo=1 for linux." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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 | « no previous file | trunk/src/chrome/chrome.isolate » ('j') | 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 828 matching lines...) Expand 10 before | Expand all | Expand 10 after
839 }], 839 }],
840 840
841 # By default, use ICU data file (icudtl.dat) on all platforms 841 # By default, use ICU data file (icudtl.dat) on all platforms
842 # except when building Android WebView. 842 # except when building Android WebView.
843 # TODO(jshin): Handle 'use_system_icu' on Linux (Chromium). 843 # TODO(jshin): Handle 'use_system_icu' on Linux (Chromium).
844 ['android_webview_build==0', { 844 ['android_webview_build==0', {
845 'icu_use_data_file_flag%' : 1, 845 'icu_use_data_file_flag%' : 1,
846 }, { 846 }, {
847 'icu_use_data_file_flag%' : 0, 847 'icu_use_data_file_flag%' : 0,
848 }], 848 }],
849
850 ['OS=="linux"', {
851 'use_mojo%': 1,
852 }],
853 ], 849 ],
854 850
855 # Set this to 1 to enable use of concatenated impulse responses 851 # Set this to 1 to enable use of concatenated impulse responses
856 # for the HRTF panner in WebAudio. 852 # for the HRTF panner in WebAudio.
857 'use_concatenated_impulse_responses': 1, 853 'use_concatenated_impulse_responses': 1,
858 854
859 # You can set the variable 'use_official_google_api_keys' to 1 855 # You can set the variable 'use_official_google_api_keys' to 1
860 # to use the Google-internal file containing official API keys 856 # to use the Google-internal file containing official API keys
861 # for Google Chrome even in a developer build. Setting this 857 # for Google Chrome even in a developer build. Setting this
862 # variable explicitly to 1 will cause your build to fail if the 858 # variable explicitly to 1 will cause your build to fail if the
(...skipping 4256 matching lines...) Expand 10 before | Expand all | Expand 10 after
5119 # settings in target dicts. SYMROOT is a special case, because many other 5115 # settings in target dicts. SYMROOT is a special case, because many other
5120 # Xcode variables depend on it, including variables such as 5116 # Xcode variables depend on it, including variables such as
5121 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5117 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5122 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5118 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5123 # files to appear (when present) in the UI as actual files and not red 5119 # files to appear (when present) in the UI as actual files and not red
5124 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5120 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5125 # and therefore SYMROOT, needs to be set at the project level. 5121 # and therefore SYMROOT, needs to be set at the project level.
5126 'SYMROOT': '<(DEPTH)/xcodebuild', 5122 'SYMROOT': '<(DEPTH)/xcodebuild',
5127 }, 5123 },
5128 } 5124 }
OLDNEW
« no previous file with comments | « no previous file | trunk/src/chrome/chrome.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698