| OLD | NEW | 
|---|
| 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 354 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 365           'file_manager_extension%': 0, | 365           'file_manager_extension%': 0, | 
| 366         }], | 366         }], | 
| 367 | 367 | 
| 368         # Enable WebUI TaskManager on Chrome OS or Aura. | 368         # Enable WebUI TaskManager on Chrome OS or Aura. | 
| 369         ['chromeos==1 or use_aura==1', { | 369         ['chromeos==1 or use_aura==1', { | 
| 370           'webui_task_manager%': 1, | 370           'webui_task_manager%': 1, | 
| 371         }], | 371         }], | 
| 372 | 372 | 
| 373         # TODO(akalin): Enable this for all GTK/views platforms (except for | 373         # TODO(akalin): Enable this for all GTK/views platforms (except for | 
| 374         # ChromeOS). | 374         # ChromeOS). | 
| 375         ['OS=="win" or OS=="mac" or (OS=="linux" and chromeos==0)', { | 375         ['OS=="win" or OS=="mac" or (OS=="linux" and use_aura==0)', { | 
| 376           'enable_one_click_signin%': 1, | 376           'enable_one_click_signin%': 1, | 
| 377         }], | 377         }], | 
| 378 | 378 | 
| 379         ['OS=="android"', { | 379         ['OS=="android"', { | 
| 380           'proprietary_codecs%': 1, | 380           'proprietary_codecs%': 1, | 
| 381           'enable_webrtc%': 0, | 381           'enable_webrtc%': 0, | 
| 382         }], | 382         }], | 
| 383 | 383 | 
| 384         # Use GPU accelerated cross process image transport by default | 384         # Use GPU accelerated cross process image transport by default | 
| 385         # on linux builds with the Aura window manager | 385         # on linux builds with the Aura window manager | 
| (...skipping 2571 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2957     # settings in target dicts.  SYMROOT is a special case, because many other | 2957     # settings in target dicts.  SYMROOT is a special case, because many other | 
| 2958     # Xcode variables depend on it, including variables such as | 2958     # Xcode variables depend on it, including variables such as | 
| 2959     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 2959     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 
| 2960     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 2960     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 
| 2961     # files to appear (when present) in the UI as actual files and not red | 2961     # files to appear (when present) in the UI as actual files and not red | 
| 2962     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 2962     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 
| 2963     # and therefore SYMROOT, needs to be set at the project level. | 2963     # and therefore SYMROOT, needs to be set at the project level. | 
| 2964     'SYMROOT': '<(DEPTH)/xcodebuild', | 2964     'SYMROOT': '<(DEPTH)/xcodebuild', | 
| 2965   }, | 2965   }, | 
| 2966 } | 2966 } | 
| OLD | NEW | 
|---|