| 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 2544 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2555             }, | 2555             }, | 
| 2556           }], | 2556           }], | 
| 2557         ], | 2557         ], | 
| 2558       }, | 2558       }, | 
| 2559       'Release_Base': { | 2559       'Release_Base': { | 
| 2560         'abstract': 1, | 2560         'abstract': 1, | 
| 2561         'defines': [ | 2561         'defines': [ | 
| 2562           'NDEBUG', | 2562           'NDEBUG', | 
| 2563         ], | 2563         ], | 
| 2564         'xcode_settings': { | 2564         'xcode_settings': { | 
| 2565           'DEAD_CODE_STRIPPING': 'YES',  # -Wl,-dead_strip | 2565           #'DEAD_CODE_STRIPPING': 'YES',  # -Wl,-dead_strip  # lto + this = ld c
      rash | 
| 2566           'GCC_OPTIMIZATION_LEVEL': '<(mac_release_optimization)', | 2566           'GCC_OPTIMIZATION_LEVEL': '<(mac_release_optimization)', | 
| 2567           'OTHER_CFLAGS': [ '<@(release_extra_cflags)', ], | 2567           'OTHER_CFLAGS': [ '<@(release_extra_cflags)', | 
|  | 2568                 '-Qunused-arguments',  # -flto for .S files for example. | 
|  | 2569           ], | 
|  | 2570           'LLVM_LTO': 'YES',  # -flto, XXX | 
|  | 2571             # makes libtool complain like | 
|  | 2572             # "descriptor.o is not an object file (not allowed in a library)" | 
|  | 2573             # with xcodebuild? at least with xcode 3.2.6. | 
| 2568         }, | 2574         }, | 
| 2569         'msvs_settings': { | 2575         'msvs_settings': { | 
| 2570           'VCCLCompilerTool': { | 2576           'VCCLCompilerTool': { | 
| 2571             'RuntimeLibrary': '<(win_release_RuntimeLibrary)', | 2577             'RuntimeLibrary': '<(win_release_RuntimeLibrary)', | 
| 2572             'conditions': [ | 2578             'conditions': [ | 
| 2573               # In official builds, each target will self-select | 2579               # In official builds, each target will self-select | 
| 2574               # an optimization level. | 2580               # an optimization level. | 
| 2575               ['buildtype!="Official"', { | 2581               ['buildtype!="Official"', { | 
| 2576                   'Optimization': '<(win_release_Optimization)', | 2582                   'Optimization': '<(win_release_Optimization)', | 
| 2577                 }, | 2583                 }, | 
| (...skipping 2065 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 4643     # settings in target dicts.  SYMROOT is a special case, because many other | 4649     # settings in target dicts.  SYMROOT is a special case, because many other | 
| 4644     # Xcode variables depend on it, including variables such as | 4650     # Xcode variables depend on it, including variables such as | 
| 4645     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 4651     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 
| 4646     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 4652     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 
| 4647     # files to appear (when present) in the UI as actual files and not red | 4653     # files to appear (when present) in the UI as actual files and not red | 
| 4648     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 4654     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 
| 4649     # and therefore SYMROOT, needs to be set at the project level. | 4655     # and therefore SYMROOT, needs to be set at the project level. | 
| 4650     'SYMROOT': '<(DEPTH)/xcodebuild', | 4656     'SYMROOT': '<(DEPTH)/xcodebuild', | 
| 4651   }, | 4657   }, | 
| 4652 } | 4658 } | 
| OLD | NEW | 
|---|