| 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 960 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   971         'mac_sdk%': '<!(python <(DEPTH)/build/mac/find_sdk.py 10.6)', |   971         'mac_sdk%': '<!(python <(DEPTH)/build/mac/find_sdk.py 10.6)', | 
|   972  |   972  | 
|   973         # iOS SDK and deployment target support.  The iOS 5.0 SDK is actually |   973         # iOS SDK and deployment target support.  The iOS 5.0 SDK is actually | 
|   974         # what is required, but the value is left blank so when it is set in |   974         # what is required, but the value is left blank so when it is set in | 
|   975         # the project files it will be the "current" iOS SDK.  Forcing 5.0 |   975         # the project files it will be the "current" iOS SDK.  Forcing 5.0 | 
|   976         # even though it is "current" causes Xcode to spit out a warning for |   976         # even though it is "current" causes Xcode to spit out a warning for | 
|   977         # every single project file for not using the "current" SDK. |   977         # every single project file for not using the "current" SDK. | 
|   978         'ios_sdk%': '', |   978         'ios_sdk%': '', | 
|   979         'ios_sdk_path%': '', |   979         'ios_sdk_path%': '', | 
|   980         'ios_deployment_target%': '4.3', |   980         'ios_deployment_target%': '4.3', | 
|   981       }], |   981  | 
 |   982         'conditions': [ | 
 |   983           # ios_product_name is set to the name of the .app bundle as it should | 
 |   984           # appear on disk. | 
 |   985           ['branding=="Chrome"', { | 
 |   986             'ios_product_name%': 'Chrome', | 
 |   987           }, { # else: branding!="Chrome" | 
 |   988             'ios_product_name%': 'Chromium', | 
 |   989           }], | 
 |   990           ['branding=="Chrome" and buildtype=="Official"', { | 
 |   991             'ios_breakpad%': 1, | 
 |   992           }, { # else: branding!="Chrome" or buildtype!="Official" | 
 |   993             'ios_breakpad%': 0, | 
 |   994           }], | 
 |   995         ], | 
 |   996       }],  # OS=="ios" | 
|   982       ['OS=="android"', { |   997       ['OS=="android"', { | 
|   983         # Location of Android NDK. |   998         # Location of Android NDK. | 
|   984         'variables': { |   999         'variables': { | 
|   985           'variables': { |  1000           'variables': { | 
|   986             'variables': { |  1001             'variables': { | 
|   987               'android_ndk_root%': '<!(/bin/echo -n $ANDROID_NDK_ROOT)', |  1002               'android_ndk_root%': '<!(/bin/echo -n $ANDROID_NDK_ROOT)', | 
|   988             }, |  1003             }, | 
|   989             'android_ndk_root%': '<(android_ndk_root)', |  1004             'android_ndk_root%': '<(android_ndk_root)', | 
|   990             'conditions': [ |  1005             'conditions': [ | 
|   991               ['target_arch == "ia32"', { |  1006               ['target_arch == "ia32"', { | 
| (...skipping 2614 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  3606     # settings in target dicts.  SYMROOT is a special case, because many other |  3621     # settings in target dicts.  SYMROOT is a special case, because many other | 
|  3607     # Xcode variables depend on it, including variables such as |  3622     # Xcode variables depend on it, including variables such as | 
|  3608     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something |  3623     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 
|  3609     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |  3624     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 
|  3610     # files to appear (when present) in the UI as actual files and not red |  3625     # files to appear (when present) in the UI as actual files and not red | 
|  3611     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |  3626     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 
|  3612     # and therefore SYMROOT, needs to be set at the project level. |  3627     # and therefore SYMROOT, needs to be set at the project level. | 
|  3613     'SYMROOT': '<(DEPTH)/xcodebuild', |  3628     'SYMROOT': '<(DEPTH)/xcodebuild', | 
|  3614   }, |  3629   }, | 
|  3615 } |  3630 } | 
| OLD | NEW |