| 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 636 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   647       # require server-side APIs may fail to work if no keys are |   647       # require server-side APIs may fail to work if no keys are | 
|   648       # provided. |   648       # provided. | 
|   649       # |   649       # | 
|   650       # Note that if you are building an official build or if |   650       # Note that if you are building an official build or if | 
|   651       # use_official_google_api_keys has been set to 1 (explicitly or |   651       # use_official_google_api_keys has been set to 1 (explicitly or | 
|   652       # implicitly), these values will be ignored and the official |   652       # implicitly), these values will be ignored and the official | 
|   653       # keys will be used instead. |   653       # keys will be used instead. | 
|   654       'google_api_key%': '', |   654       'google_api_key%': '', | 
|   655       'google_default_client_id%': '', |   655       'google_default_client_id%': '', | 
|   656       'google_default_client_secret%': '', |   656       'google_default_client_secret%': '', | 
 |   657  | 
 |   658       # Whether Android uses OpenMAX DL FFT.  Default is no. | 
 |   659       'use_openmax_dl_fft%': 0, | 
|   657     }, |   660     }, | 
|   658  |   661  | 
|   659     # Copy conditionally-set variables out one scope. |   662     # Copy conditionally-set variables out one scope. | 
|   660     'branding%': '<(branding)', |   663     'branding%': '<(branding)', | 
|   661     'buildtype%': '<(buildtype)', |   664     'buildtype%': '<(buildtype)', | 
|   662     'target_arch%': '<(target_arch)', |   665     'target_arch%': '<(target_arch)', | 
|   663     'host_arch%': '<(host_arch)', |   666     'host_arch%': '<(host_arch)', | 
|   664     'toolkit_views%': '<(toolkit_views)', |   667     'toolkit_views%': '<(toolkit_views)', | 
|   665     'ui_compositor_image_transport%': '<(ui_compositor_image_transport)', |   668     'ui_compositor_image_transport%': '<(ui_compositor_image_transport)', | 
|   666     'use_aura%': '<(use_aura)', |   669     'use_aura%': '<(use_aura)', | 
| (...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   904     # Set Thumb compilation flags. |   907     # Set Thumb compilation flags. | 
|   905     'arm_thumb%': 0, |   908     'arm_thumb%': 0, | 
|   906  |   909  | 
|   907     # Set ARM fpu compilation flags (only meaningful if armv7==1 and |   910     # Set ARM fpu compilation flags (only meaningful if armv7==1 and | 
|   908     # arm_neon==0). |   911     # arm_neon==0). | 
|   909     'arm_fpu%': 'vfpv3', |   912     'arm_fpu%': 'vfpv3', | 
|   910  |   913  | 
|   911     # Set ARM float abi compilation flag. |   914     # Set ARM float abi compilation flag. | 
|   912     'arm_float_abi%': 'softfp', |   915     'arm_float_abi%': 'softfp', | 
|   913  |   916  | 
 |   917     # Enable use of OpenMAX DL FFT routines. | 
 |   918     'use_openmax_dl_fft%': '<(use_openmax_dl_fft)', | 
 |   919      | 
|   914     # Enable new NPDevice API. |   920     # Enable new NPDevice API. | 
|   915     'enable_new_npdevice_api%': 0, |   921     'enable_new_npdevice_api%': 0, | 
|   916  |   922  | 
|   917     # Enable EGLImage support in OpenMAX |   923     # Enable EGLImage support in OpenMAX | 
|   918     'enable_eglimage%': 1, |   924     'enable_eglimage%': 1, | 
|   919  |   925  | 
|   920     # Enable a variable used elsewhere throughout the GYP files to determine |   926     # Enable a variable used elsewhere throughout the GYP files to determine | 
|   921     # whether to compile in the sources for the GPU plugin / process. |   927     # whether to compile in the sources for the GPU plugin / process. | 
|   922     'enable_gpu%': 1, |   928     'enable_gpu%': 1, | 
|   923  |   929  | 
| (...skipping 3182 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  4106     # settings in target dicts.  SYMROOT is a special case, because many other |  4112     # settings in target dicts.  SYMROOT is a special case, because many other | 
|  4107     # Xcode variables depend on it, including variables such as |  4113     # Xcode variables depend on it, including variables such as | 
|  4108     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something |  4114     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 
|  4109     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |  4115     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 
|  4110     # files to appear (when present) in the UI as actual files and not red |  4116     # files to appear (when present) in the UI as actual files and not red | 
|  4111     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |  4117     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 
|  4112     # and therefore SYMROOT, needs to be set at the project level. |  4118     # and therefore SYMROOT, needs to be set at the project level. | 
|  4113     'SYMROOT': '<(DEPTH)/xcodebuild', |  4119     'SYMROOT': '<(DEPTH)/xcodebuild', | 
|  4114   }, |  4120   }, | 
|  4115 } |  4121 } | 
| OLD | NEW |