Chromium Code Reviews| 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 2382 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2393 'inherit_from': ['Common_Base', 'x64_Base', 'Debug_Base'], | 2393 'inherit_from': ['Common_Base', 'x64_Base', 'Debug_Base'], |
| 2394 }, | 2394 }, |
| 2395 'Release_x64': { | 2395 'Release_x64': { |
| 2396 'inherit_from': ['Common_Base', 'x64_Base', 'Release_Base'], | 2396 'inherit_from': ['Common_Base', 'x64_Base', 'Release_Base'], |
| 2397 }, | 2397 }, |
| 2398 }], | 2398 }], |
| 2399 ], | 2399 ], |
| 2400 }, | 2400 }, |
| 2401 }, | 2401 }, |
| 2402 'conditions': [ | 2402 'conditions': [ |
| 2403 ['1==1', { | |
|
Mark Mentovai
2013/02/08 17:45:13
You’re not actually in target_defaults here, so…
| |
| 2404 'dependencies': [ | |
|
Mark Mentovai
2013/02/08 17:45:13
…this 'dependencies' section gets included into th
| |
| 2405 '<(DEPTH)/build/asan.gyp:asan_dynamic_runtime', | |
| 2406 ], | |
| 2407 }], | |
| 2408 | |
| 2403 ['os_posix==1', { | 2409 ['os_posix==1', { |
| 2404 'target_defaults': { | 2410 'target_defaults': { |
| 2405 'ldflags': [ | 2411 'ldflags': [ |
| 2406 '-Wl,-z,now', | 2412 '-Wl,-z,now', |
| 2407 '-Wl,-z,relro', | 2413 '-Wl,-z,relro', |
| 2408 ], | 2414 ], |
| 2409 }, | 2415 }, |
| 2410 }], | 2416 }], |
| 2411 ['os_posix==1 and chromeos==0', { | 2417 ['os_posix==1 and chromeos==0', { |
| 2412 # Chrome OS enables -fstack-protector-strong via its build wrapper, | 2418 # Chrome OS enables -fstack-protector-strong via its build wrapper, |
| (...skipping 1619 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4032 # xcode_settings sections, or better yet, should use non-Xcode-specific | 4038 # xcode_settings sections, or better yet, should use non-Xcode-specific |
| 4033 # settings in target dicts. SYMROOT is a special case, because many other | 4039 # settings in target dicts. SYMROOT is a special case, because many other |
| 4034 # Xcode variables depend on it, including variables such as | 4040 # Xcode variables depend on it, including variables such as |
| 4035 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 4041 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 4036 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 4042 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 4037 # files to appear (when present) in the UI as actual files and not red | 4043 # files to appear (when present) in the UI as actual files and not red |
| 4038 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 4044 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 4039 # and therefore SYMROOT, needs to be set at the project level. | 4045 # and therefore SYMROOT, needs to be set at the project level. |
| 4040 'SYMROOT': '<(DEPTH)/xcodebuild', | 4046 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 4041 }, | 4047 }, |
| 4048 | |
| 4042 } | 4049 } |
| OLD | NEW |