| 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 857 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 868           'android_ndk_sysroot': '<(android_ndk_root)/platforms/android-9/arch-<
      (target_arch)', | 868           'android_ndk_sysroot': '<(android_ndk_root)/platforms/android-9/arch-<
      (target_arch)', | 
| 869           'android_build_type%': '<(android_build_type)', | 869           'android_build_type%': '<(android_build_type)', | 
| 870           'android_app_abi%': '<(android_app_abi)', | 870           'android_app_abi%': '<(android_app_abi)', | 
| 871         }, | 871         }, | 
| 872         'android_ndk_root%': '<(android_ndk_root)', | 872         'android_ndk_root%': '<(android_ndk_root)', | 
| 873         'android_ndk_sysroot': '<(android_ndk_sysroot)', | 873         'android_ndk_sysroot': '<(android_ndk_sysroot)', | 
| 874         'android_ndk_include': '<(android_ndk_sysroot)/usr/include', | 874         'android_ndk_include': '<(android_ndk_sysroot)/usr/include', | 
| 875         'android_ndk_lib': '<(android_ndk_sysroot)/usr/lib', | 875         'android_ndk_lib': '<(android_ndk_sysroot)/usr/lib', | 
| 876         'android_app_abi%': '<(android_app_abi)', | 876         'android_app_abi%': '<(android_app_abi)', | 
| 877 | 877 | 
|  | 878         # Provides an absolute path to PRODUCT_DIR (e.g. out/Release). Used | 
|  | 879         # to specify the output directory for Ant in the Android build. | 
|  | 880         'ant_build_out': '`cd <(PRODUCT_DIR) && pwd -P`', | 
|  | 881 | 
| 878         # Uses Android's crash report system | 882         # Uses Android's crash report system | 
| 879         'linux_breakpad%': 0, | 883         'linux_breakpad%': 0, | 
| 880 | 884 | 
| 881         # Always uses openssl. | 885         # Always uses openssl. | 
| 882         'use_openssl%': 1, | 886         'use_openssl%': 1, | 
| 883 | 887 | 
| 884         'proprietary_codecs%': '<(proprietary_codecs)', | 888         'proprietary_codecs%': '<(proprietary_codecs)', | 
| 885         'enable_task_manager%': 0, | 889         'enable_task_manager%': 0, | 
| 886         'safe_browsing%': 0, | 890         'safe_browsing%': 0, | 
| 887         'configuration_policy%': 0, | 891         'configuration_policy%': 0, | 
| (...skipping 2230 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 3118     # settings in target dicts.  SYMROOT is a special case, because many other | 3122     # settings in target dicts.  SYMROOT is a special case, because many other | 
| 3119     # Xcode variables depend on it, including variables such as | 3123     # Xcode variables depend on it, including variables such as | 
| 3120     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 3124     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 
| 3121     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 3125     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 
| 3122     # files to appear (when present) in the UI as actual files and not red | 3126     # files to appear (when present) in the UI as actual files and not red | 
| 3123     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 3127     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 
| 3124     # and therefore SYMROOT, needs to be set at the project level. | 3128     # and therefore SYMROOT, needs to be set at the project level. | 
| 3125     'SYMROOT': '<(DEPTH)/xcodebuild', | 3129     'SYMROOT': '<(DEPTH)/xcodebuild', | 
| 3126   }, | 3130   }, | 
| 3127 } | 3131 } | 
| OLD | NEW | 
|---|