| 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 1927 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1938           # the version of the system headers that will be used, and | 1938           # the version of the system headers that will be used, and | 
| 1939           # corresponds to the MAC_OS_X_VERSION_MAX_ALLOWED compile-time | 1939           # corresponds to the MAC_OS_X_VERSION_MAX_ALLOWED compile-time | 
| 1940           # macro.  "Maximum allowed" refers to the operating system version | 1940           # macro.  "Maximum allowed" refers to the operating system version | 
| 1941           # whose APIs are available in the headers.  The deployment target | 1941           # whose APIs are available in the headers.  The deployment target | 
| 1942           # identifies the minimum system version that the built products are | 1942           # identifies the minimum system version that the built products are | 
| 1943           # expected to function on.  It corresponds to the | 1943           # expected to function on.  It corresponds to the | 
| 1944           # MAC_OS_X_VERSION_MIN_REQUIRED compile-time macro.  To ensure these | 1944           # MAC_OS_X_VERSION_MIN_REQUIRED compile-time macro.  To ensure these | 
| 1945           # macros are available, #include <AvailabilityMacros.h>.  Additional | 1945           # macros are available, #include <AvailabilityMacros.h>.  Additional | 
| 1946           # documentation on these macros is available at | 1946           # documentation on these macros is available at | 
| 1947           # http://developer.apple.com/mac/library/technotes/tn2002/tn2064.html#
      SECTION3 | 1947           # http://developer.apple.com/mac/library/technotes/tn2002/tn2064.html#
      SECTION3 | 
| 1948           # Chrome normally builds with the Mac OS X 10.6 SDK and sets the | 1948           # Chrome normally builds with the Mac OS X 10.10 SDK and sets the | 
| 1949           # deployment target to 10.6.  Other projects, such as O3D, may | 1949           # deployment target to 10.7.  Other projects, such as O3D, may | 
| 1950           # override these defaults. | 1950           # override these defaults. | 
| 1951 | 1951 | 
| 1952           # Normally, mac_sdk_min is used to find an SDK that Xcode knows | 1952           # Normally, mac_sdk_min is used to find an SDK that Xcode knows | 
| 1953           # about that is at least the specified version. In official builds, | 1953           # about that is at least the specified version. In official builds, | 
| 1954           # the SDK must match mac_sdk_min exactly. If the SDK is installed | 1954           # the SDK must match mac_sdk_min exactly. If the SDK is installed | 
| 1955           # someplace that Xcode doesn't know about, set mac_sdk_path to the | 1955           # someplace that Xcode doesn't know about, set mac_sdk_path to the | 
| 1956           # path to the SDK; when set to a non-empty string, SDK detection | 1956           # path to the SDK; when set to a non-empty string, SDK detection | 
| 1957           # based on mac_sdk_min will be bypassed entirely. | 1957           # based on mac_sdk_min will be bypassed entirely. | 
| 1958           'conditions': [ | 1958           'mac_deployment_target%': '10.7', | 
| 1959             ['OS=="ios"', { |  | 
| 1960               # The iOS build can use Xcode's clang, and that will complain |  | 
| 1961               # about -stdlib=libc++ if the deployment target is not at least |  | 
| 1962               # 10.7. |  | 
| 1963               'mac_deployment_target%': '10.7', |  | 
| 1964             }, {  # else OS!="ios" |  | 
| 1965               'mac_deployment_target%': '10.6', |  | 
| 1966             }], |  | 
| 1967           ], |  | 
| 1968           'mac_sdk_min%': '10.10', | 1959           'mac_sdk_min%': '10.10', | 
| 1969           'mac_sdk_path%': '', | 1960           'mac_sdk_path%': '', | 
| 1970         }, | 1961         }, | 
| 1971 | 1962 | 
| 1972         'mac_sdk_min': '<(mac_sdk_min)', | 1963         'mac_sdk_min': '<(mac_sdk_min)', | 
| 1973         'mac_sdk_path': '<(mac_sdk_path)', | 1964         'mac_sdk_path': '<(mac_sdk_path)', | 
| 1974         'mac_deployment_target': '<(mac_deployment_target)', | 1965         'mac_deployment_target': '<(mac_deployment_target)', | 
| 1975 | 1966 | 
| 1976         # Compile in Breakpad support by default so that it can be | 1967         # Compile in Breakpad support by default so that it can be | 
| 1977         # tested, even if it is not enabled by default at runtime. | 1968         # tested, even if it is not enabled by default at runtime. | 
| (...skipping 4394 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 6372     # settings in target dicts.  SYMROOT is a special case, because many other | 6363     # settings in target dicts.  SYMROOT is a special case, because many other | 
| 6373     # Xcode variables depend on it, including variables such as | 6364     # Xcode variables depend on it, including variables such as | 
| 6374     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 6365     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 
| 6375     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 6366     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 
| 6376     # files to appear (when present) in the UI as actual files and not red | 6367     # files to appear (when present) in the UI as actual files and not red | 
| 6377     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 6368     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 
| 6378     # and therefore SYMROOT, needs to be set at the project level. | 6369     # and therefore SYMROOT, needs to be set at the project level. | 
| 6379     'SYMROOT': '<(DEPTH)/xcodebuild', | 6370     'SYMROOT': '<(DEPTH)/xcodebuild', | 
| 6380   }, | 6371   }, | 
| 6381 } | 6372 } | 
| OLD | NEW | 
|---|