Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2014 The Crashpad Authors. All rights reserved. | 1 # Copyright 2014 The Crashpad Authors. All rights reserved. |
| 2 # | 2 # |
| 3 # Licensed under the Apache License, Version 2.0 (the "License"); | 3 # Licensed under the Apache License, Version 2.0 (the "License"); |
| 4 # you may not use this file except in compliance with the License. | 4 # you may not use this file except in compliance with the License. |
| 5 # You may obtain a copy of the License at | 5 # You may obtain a copy of the License at |
| 6 # | 6 # |
| 7 # http://www.apache.org/licenses/LICENSE-2.0 | 7 # http://www.apache.org/licenses/LICENSE-2.0 |
| 8 # | 8 # |
| 9 # Unless required by applicable law or agreed to in writing, software | 9 # Unless required by applicable law or agreed to in writing, software |
| 10 # distributed under the License is distributed on an "AS IS" BASIS, | 10 # distributed under the License is distributed on an "AS IS" BASIS, |
| (...skipping 28 matching lines...) Expand all Loading... | |
| 39 ['GENERATOR=="ninja"', { | 39 ['GENERATOR=="ninja"', { |
| 40 'sectaskaccess_info_plist': '<!(pwd)/mac/sectaskaccess_info.plist', | 40 'sectaskaccess_info_plist': '<!(pwd)/mac/sectaskaccess_info.plist', |
| 41 }, { # else: GENERATOR!="ninja" | 41 }, { # else: GENERATOR!="ninja" |
| 42 'sectaskaccess_info_plist': 'mac/sectaskaccess_info.plist', | 42 'sectaskaccess_info_plist': 'mac/sectaskaccess_info.plist', |
| 43 }], | 43 }], |
| 44 ], | 44 ], |
| 45 }, | 45 }, |
| 46 | 46 |
| 47 'targets': [ | 47 'targets': [ |
| 48 { | 48 { |
| 49 'target_name': 'crashpad_tool_support', | |
| 50 'type': 'static_library', | |
| 51 'dependencies': [ | |
| 52 '../third_party/mini_chromium/mini_chromium.gyp:base', | |
| 53 ], | |
| 54 'include_dirs': [ | |
| 55 '..', | |
| 56 ], | |
| 57 'sources': [ | |
| 58 'tool_support.cc', | |
| 59 'tool_support.h', | |
| 60 ], | |
| 61 }, | |
| 62 { | |
| 63 'target_name': 'crashpad_database_util', | |
| 64 'type': 'executable', | |
| 65 'dependencies': [ | |
| 66 'crashpad_tool_support', | |
| 67 '../client/client.gyp:crashpad_client', | |
| 68 '../compat/compat.gyp:crashpad_compat', | |
| 69 '../third_party/mini_chromium/mini_chromium.gyp:base', | |
| 70 '../util/util.gyp:crashpad_util', | |
| 71 ], | |
| 72 'include_dirs': [ | |
| 73 '..', | |
| 74 ], | |
| 75 'sources': [ | |
| 76 'crashpad_database_util.cc', | |
| 77 ], | |
| 78 }, | |
| 79 { | |
| 80 'target_name': 'catch_exception_tool', | 49 'target_name': 'catch_exception_tool', |
| 81 'type': 'executable', | 50 'type': 'executable', |
| 82 'dependencies': [ | 51 'dependencies': [ |
| 83 'crashpad_tool_support', | 52 'crashpad_tool_support', |
| 84 '../compat/compat.gyp:crashpad_compat', | 53 '../compat/compat.gyp:crashpad_compat', |
| 85 '../third_party/mini_chromium/mini_chromium.gyp:base', | 54 '../third_party/mini_chromium/mini_chromium.gyp:base', |
| 86 '../util/util.gyp:crashpad_util', | 55 '../util/util.gyp:crashpad_util', |
| 87 ], | 56 ], |
| 88 'include_dirs': [ | 57 'include_dirs': [ |
| 89 '..', | 58 '..', |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 176 ], | 145 ], |
| 177 'include_dirs': [ | 146 'include_dirs': [ |
| 178 '..', | 147 '..', |
| 179 ], | 148 ], |
| 180 'sources': [ | 149 'sources': [ |
| 181 'mac/run_with_crashpad.cc', | 150 'mac/run_with_crashpad.cc', |
| 182 ], | 151 ], |
| 183 }, | 152 }, |
| 184 ], | 153 ], |
| 185 }, { | 154 }, { |
| 186 'targets': [], | 155 'targets': [ |
|
Mark Mentovai
2015/05/04 21:04:30
Now this is in an else block that’s live on non-Ma
scottmg
2015/05/04 23:26:36
Oh, geez, oops. Done.
| |
| 156 { | |
| 157 'target_name': 'crashpad_tool_support', | |
| 158 'type': 'static_library', | |
| 159 'dependencies': [ | |
| 160 '../third_party/mini_chromium/mini_chromium.gyp:base', | |
| 161 ], | |
| 162 'include_dirs': [ | |
| 163 '..', | |
| 164 ], | |
| 165 'sources': [ | |
| 166 'tool_support.cc', | |
| 167 'tool_support.h', | |
| 168 ], | |
| 169 }, | |
| 170 { | |
| 171 'target_name': 'crashpad_database_util', | |
| 172 'type': 'executable', | |
| 173 'dependencies': [ | |
| 174 'crashpad_tool_support', | |
| 175 '../client/client.gyp:crashpad_client', | |
| 176 '../compat/compat.gyp:crashpad_compat', | |
| 177 '../third_party/mini_chromium/mini_chromium.gyp:base', | |
| 178 '../util/util.gyp:crashpad_util', | |
| 179 ], | |
| 180 'include_dirs': [ | |
| 181 '..', | |
| 182 ], | |
| 183 'sources': [ | |
| 184 'crashpad_database_util.cc', | |
| 185 ], | |
| 186 }, | |
| 187 ], | |
| 187 }], | 188 }], |
| 188 ], | 189 ], |
| 189 } | 190 } |
| OLD | NEW |