| 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 350 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 361           'file_manager_extension%': 1, | 361           'file_manager_extension%': 1, | 
| 362         }, { | 362         }, { | 
| 363           'file_manager_extension%': 0, | 363           'file_manager_extension%': 0, | 
| 364         }], | 364         }], | 
| 365 | 365 | 
| 366         # Enable WebUI TaskManager on Chrome OS or Aura. | 366         # Enable WebUI TaskManager on Chrome OS or Aura. | 
| 367         ['chromeos==1 or use_aura==1', { | 367         ['chromeos==1 or use_aura==1', { | 
| 368           'webui_task_manager%': 1, | 368           'webui_task_manager%': 1, | 
| 369         }], | 369         }], | 
| 370 | 370 | 
| 371         # For now one-click signin is enabled only for windows and mac | 371         # TODO(akalin): Enable this for all GTK/views platforms (except for | 
| 372         # since the UI is not yet complete for other platforms. | 372         # ChromeOS). | 
| 373         ['OS=="win" or OS=="mac"', { | 373         ['OS=="win" or OS=="mac" or (OS=="linux" and chromeos==0)', { | 
| 374           'enable_one_click_signin%': 1, | 374           'enable_one_click_signin%': 1, | 
| 375         }], | 375         }], | 
| 376 | 376 | 
| 377         ['OS=="android"', { | 377         ['OS=="android"', { | 
| 378           'proprietary_codecs%': 1, | 378           'proprietary_codecs%': 1, | 
| 379           'enable_webrtc%': 0, | 379           'enable_webrtc%': 0, | 
| 380         }], | 380         }], | 
| 381 | 381 | 
| 382         # Use GPU accelerated cross process image transport by default | 382         # Use GPU accelerated cross process image transport by default | 
| 383         # on linux builds with the Aura window manager | 383         # on linux builds with the Aura window manager | 
| (...skipping 2564 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2948     # settings in target dicts.  SYMROOT is a special case, because many other | 2948     # settings in target dicts.  SYMROOT is a special case, because many other | 
| 2949     # Xcode variables depend on it, including variables such as | 2949     # Xcode variables depend on it, including variables such as | 
| 2950     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 2950     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 
| 2951     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 2951     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 
| 2952     # files to appear (when present) in the UI as actual files and not red | 2952     # files to appear (when present) in the UI as actual files and not red | 
| 2953     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 2953     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 
| 2954     # and therefore SYMROOT, needs to be set at the project level. | 2954     # and therefore SYMROOT, needs to be set at the project level. | 
| 2955     'SYMROOT': '<(DEPTH)/xcodebuild', | 2955     'SYMROOT': '<(DEPTH)/xcodebuild', | 
| 2956   }, | 2956   }, | 
| 2957 } | 2957 } | 
| OLD | NEW | 
|---|