| 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 136 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   147             'enable_message_center%': 1, |   147             'enable_message_center%': 1, | 
|   148           }, { |   148           }, { | 
|   149             'enable_message_center%': 0, |   149             'enable_message_center%': 0, | 
|   150           }], |   150           }], | 
|   151  |   151  | 
|   152           ['use_aura==1 or (OS!="win" and OS!="mac" and OS!="ios" and OS!="andro
      id")', { |   152           ['use_aura==1 or (OS!="win" and OS!="mac" and OS!="ios" and OS!="andro
      id")', { | 
|   153             'use_default_render_theme%': 1, |   153             'use_default_render_theme%': 1, | 
|   154           }, { |   154           }, { | 
|   155             'use_default_render_theme%': 0, |   155             'use_default_render_theme%': 0, | 
|   156           }], |   156           }], | 
|   157  |  | 
|   158           ['OS!="android" and OS!="ios"', { |  | 
|   159             # Enable Web Intents support in WebKit. |  | 
|   160             'enable_web_intents%': 1, |  | 
|   161           }, { |  | 
|   162             'enable_web_intents%': 0, |  | 
|   163           }], |  | 
|   164         ], |   157         ], | 
|   165       }, |   158       }, | 
|   166  |   159  | 
|   167       # Copy conditionally-set variables out one scope. |   160       # Copy conditionally-set variables out one scope. | 
|   168       'chromeos%': '<(chromeos)', |   161       'chromeos%': '<(chromeos)', | 
|   169       'host_arch%': '<(host_arch)', |   162       'host_arch%': '<(host_arch)', | 
|   170       'target_arch%': '<(target_arch)', |   163       'target_arch%': '<(target_arch)', | 
|   171       'toolkit_views%': '<(toolkit_views)', |   164       'toolkit_views%': '<(toolkit_views)', | 
|   172       'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', |   165       'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', | 
|   173       'use_aura%': '<(use_aura)', |   166       'use_aura%': '<(use_aura)', | 
|   174       'use_ash%': '<(use_ash)', |   167       'use_ash%': '<(use_ash)', | 
|   175       'use_openssl%': '<(use_openssl)', |   168       'use_openssl%': '<(use_openssl)', | 
|   176       'enable_viewport%': '<(enable_viewport)', |   169       'enable_viewport%': '<(enable_viewport)', | 
|   177       'enable_hidpi%': '<(enable_hidpi)', |   170       'enable_hidpi%': '<(enable_hidpi)', | 
|   178       'enable_touch_ui%': '<(enable_touch_ui)', |   171       'enable_touch_ui%': '<(enable_touch_ui)', | 
|   179       'android_build_type%': '<(android_build_type)', |   172       'android_build_type%': '<(android_build_type)', | 
|   180       'google_tv%': '<(google_tv)', |   173       'google_tv%': '<(google_tv)', | 
|   181       'enable_app_list%': '<(enable_app_list)', |   174       'enable_app_list%': '<(enable_app_list)', | 
|   182       'enable_message_center%': '<(enable_message_center)', |   175       'enable_message_center%': '<(enable_message_center)', | 
|   183       'use_default_render_theme%': '<(use_default_render_theme)', |   176       'use_default_render_theme%': '<(use_default_render_theme)', | 
|   184       'enable_web_intents%': '<(enable_web_intents)', |   177       'enable_web_intents%': 0,  # TODO(thakis): Remove, http://crbug.com/173194 | 
|   185       'buildtype%': '<(buildtype)', |   178       'buildtype%': '<(buildtype)', | 
|   186  |   179  | 
|   187       # We used to provide a variable for changing how libraries were built. |   180       # We used to provide a variable for changing how libraries were built. | 
|   188       # This variable remains until we can clean up all the users. |   181       # This variable remains until we can clean up all the users. | 
|   189       # This needs to be one nested variables dict in so that dependent |   182       # This needs to be one nested variables dict in so that dependent | 
|   190       # gyp files can make use of it in their outer variables.  (Yikes!) |   183       # gyp files can make use of it in their outer variables.  (Yikes!) | 
|   191       # http://code.google.com/p/chromium/issues/detail?id=83308 |   184       # http://code.google.com/p/chromium/issues/detail?id=83308 | 
|   192       'library%': 'static_library', |   185       'library%': 'static_library', | 
|   193  |   186  | 
|   194       # Override branding to select the desired branding flavor. |   187       # Override branding to select the desired branding flavor. | 
| (...skipping 3838 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  4033     # settings in target dicts.  SYMROOT is a special case, because many other |  4026     # settings in target dicts.  SYMROOT is a special case, because many other | 
|  4034     # Xcode variables depend on it, including variables such as |  4027     # Xcode variables depend on it, including variables such as | 
|  4035     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something |  4028     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 
|  4036     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |  4029     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 
|  4037     # files to appear (when present) in the UI as actual files and not red |  4030     # files to appear (when present) in the UI as actual files and not red | 
|  4038     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |  4031     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 
|  4039     # and therefore SYMROOT, needs to be set at the project level. |  4032     # and therefore SYMROOT, needs to be set at the project level. | 
|  4040     'SYMROOT': '<(DEPTH)/xcodebuild', |  4033     'SYMROOT': '<(DEPTH)/xcodebuild', | 
|  4041   }, |  4034   }, | 
|  4042 } |  4035 } | 
| OLD | NEW |