| 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 863 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   874  |   874  | 
|   875         # Enable Skia UI text drawing incrementally on different platforms. |   875         # Enable Skia UI text drawing incrementally on different platforms. | 
|   876         # http://crbug.com/105550 |   876         # http://crbug.com/105550 | 
|   877         # |   877         # | 
|   878         # On Aura, this allows per-tile painting to be used in the browser |   878         # On Aura, this allows per-tile painting to be used in the browser | 
|   879         # compositor. |   879         # compositor. | 
|   880         ['OS!="android"', { |   880         ['OS!="android"', { | 
|   881           'use_canvas_skia%': 1, |   881           'use_canvas_skia%': 1, | 
|   882         }], |   882         }], | 
|   883  |   883  | 
|   884         ['chromeos==1', { |  | 
|   885           # When building for ChromeOS we dont want Chromium to use libjpeg_turb
      o. |  | 
|   886           'use_libjpeg_turbo%': 0, |  | 
|   887         }], |  | 
|   888  |  | 
|   889         ['OS=="android"', { |   884         ['OS=="android"', { | 
|   890           # When building as part of the Android system, use system libraries |   885           # When building as part of the Android system, use system libraries | 
|   891           # where possible to reduce ROM size. |   886           # where possible to reduce ROM size. | 
|   892           'use_system_libjpeg%': '<(android_webview_build)', |   887           'use_system_libjpeg%': '<(android_webview_build)', | 
|   893         }], |   888         }], | 
|   894  |   889  | 
|   895         # Do not enable the Settings App on ChromeOS. |   890         # Do not enable the Settings App on ChromeOS. | 
|   896         ['enable_app_list==1 and chromeos==0', { |   891         ['enable_app_list==1 and chromeos==0', { | 
|   897           'enable_settings_app%': 1, |   892           'enable_settings_app%': 1, | 
|   898         }, { |   893         }, { | 
| (...skipping 591 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  1490  |  1485  | 
|  1491     # Chrome OS: whether to build ChromeVox from sources in the Chromium |  1486     # Chrome OS: whether to build ChromeVox from sources in the Chromium | 
|  1492     # repository rather than using precompiled JavaScript in |  1487     # repository rather than using precompiled JavaScript in | 
|  1493     # chrome/third_party/chromevox.  This is still experimental. |  1488     # chrome/third_party/chromevox.  This is still experimental. | 
|  1494     'use_migrated_chromevox%': 1, |  1489     'use_migrated_chromevox%': 1, | 
|  1495  |  1490  | 
|  1496     # Chrome OS: whether to also build the upcoming version of |  1491     # Chrome OS: whether to also build the upcoming version of | 
|  1497     # ChromeVox, which can then be enabled via a command-line switch. |  1492     # ChromeVox, which can then be enabled via a command-line switch. | 
|  1498     'use_chromevox_next%': 0, |  1493     'use_chromevox_next%': 0, | 
|  1499  |  1494  | 
 |  1495     # Used to set libjpeg_gyp_path. Chrome OS ui/gfx/gfx.gyp uses the IJG path | 
 |  1496     # for robust login screen decoding. | 
 |  1497     'libjpeg_ijg_gyp_path': '../third_party/libjpeg/libjpeg.gyp', | 
 |  1498     'libjpeg_turbo_gyp_path': '../third_party/libjpeg_turbo/libjpeg.gyp', | 
 |  1499  | 
|  1500     'conditions': [ |  1500     'conditions': [ | 
|  1501       # The version of clang shipped upstream does not find C++ headers when |  1501       # The version of clang shipped upstream does not find C++ headers when | 
|  1502       # using -stdlib=libc++ so we instead need to use the version of clang |  1502       # using -stdlib=libc++ so we instead need to use the version of clang | 
|  1503       # coming with Xcode. |  1503       # coming with Xcode. | 
|  1504       ['OS=="ios" and use_system_libcxx==1', { |  1504       ['OS=="ios" and use_system_libcxx==1', { | 
|  1505         'clang_xcode%': 1, |  1505         'clang_xcode%': 1, | 
|  1506       }], |  1506       }], | 
|  1507       # Enable the Syzygy optimization step for the official builds. |  1507       # Enable the Syzygy optimization step for the official builds. | 
|  1508       ['OS=="win" and buildtype=="Official" and syzyasan!=1', { |  1508       ['OS=="win" and buildtype=="Official" and syzyasan!=1', { | 
|  1509         'syzygy_optimize%': 1, |  1509         'syzygy_optimize%': 1, | 
| (...skipping 468 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  1978       ['target_arch=="arm" or target_arch=="mipsel" or target_arch=="mips64el"',
       { |  1978       ['target_arch=="arm" or target_arch=="mipsel" or target_arch=="mips64el"',
       { | 
|  1979         'disable_glibc%': 1, |  1979         'disable_glibc%': 1, | 
|  1980       }, { |  1980       }, { | 
|  1981         'disable_glibc%': 0, |  1981         'disable_glibc%': 0, | 
|  1982       }], |  1982       }], | 
|  1983  |  1983  | 
|  1984       # Set the relative path from this file to the GYP file of the JPEG |  1984       # Set the relative path from this file to the GYP file of the JPEG | 
|  1985       # library used by Chromium. |  1985       # library used by Chromium. | 
|  1986       ['use_system_libjpeg==1 or use_libjpeg_turbo==0', { |  1986       ['use_system_libjpeg==1 or use_libjpeg_turbo==0', { | 
|  1987         # Configuration for using the system libjeg is here. |  1987         # Configuration for using the system libjeg is here. | 
|  1988         'libjpeg_gyp_path': '../third_party/libjpeg/libjpeg.gyp', |  1988         'libjpeg_gyp_path': '<(libjpeg_ijg_gyp_path)', | 
|  1989       }, { |  1989       }, { | 
|  1990         'libjpeg_gyp_path': '../third_party/libjpeg_turbo/libjpeg.gyp', |  1990         'libjpeg_gyp_path': '<(libjpeg_turbo_gyp_path)', | 
|  1991       }], |  1991       }], | 
|  1992  |  1992  | 
|  1993       # Options controlling the use of GConf (the classic GNOME configuration |  1993       # Options controlling the use of GConf (the classic GNOME configuration | 
|  1994       # system) and GIO, which contains GSettings (the new GNOME config system). |  1994       # system) and GIO, which contains GSettings (the new GNOME config system). | 
|  1995       ['chromeos==1 or embedded==1', { |  1995       ['chromeos==1 or embedded==1', { | 
|  1996         'use_gconf%': 0, |  1996         'use_gconf%': 0, | 
|  1997         'use_gio%': 0, |  1997         'use_gio%': 0, | 
|  1998       }, { |  1998       }, { | 
|  1999         'use_gconf%': 1, |  1999         'use_gconf%': 1, | 
|  2000         'use_gio%': 1, |  2000         'use_gio%': 1, | 
| (...skipping 3771 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  5772     # settings in target dicts.  SYMROOT is a special case, because many other |  5772     # settings in target dicts.  SYMROOT is a special case, because many other | 
|  5773     # Xcode variables depend on it, including variables such as |  5773     # Xcode variables depend on it, including variables such as | 
|  5774     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something |  5774     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 
|  5775     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |  5775     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 
|  5776     # files to appear (when present) in the UI as actual files and not red |  5776     # files to appear (when present) in the UI as actual files and not red | 
|  5777     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |  5777     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 
|  5778     # and therefore SYMROOT, needs to be set at the project level. |  5778     # and therefore SYMROOT, needs to be set at the project level. | 
|  5779     'SYMROOT': '<(DEPTH)/xcodebuild', |  5779     'SYMROOT': '<(DEPTH)/xcodebuild', | 
|  5780   }, |  5780   }, | 
|  5781 } |  5781 } | 
| OLD | NEW |