Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(844)

Side by Side Diff: third_party/crashpad/crashpad/third_party/gtest/gmock.gyp

Issue 2773813002: Update Crashpad to 8e37886d418dd042c3c7bfadac99214739ee4d98 (Closed)
Patch Set: Update Crashpad to 8e37886d418dd042c3c7bfadac99214739ee4d98 Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 # 3.6 and later) recognize it. 97 # 3.6 and later) recognize it.
98 'conditions': [ 98 'conditions': [
99 ['OS=="mac"', { 99 ['OS=="mac"', {
100 'xcode_settings': { 100 'xcode_settings': {
101 'WARNING_CFLAGS': [ 101 'WARNING_CFLAGS': [
102 '-Wno-inconsistent-missing-override', 102 '-Wno-inconsistent-missing-override',
103 '-Wno-unknown-warning-option', 103 '-Wno-unknown-warning-option',
104 ], 104 ],
105 }, 105 },
106 }], 106 }],
107 ['OS=="linux"', { 107 ['OS=="linux" or OS=="android"', {
108 'cflags': [ 108 'cflags': [
109 '-Wno-inconsistent-missing-override', 109 '-Wno-inconsistent-missing-override',
110 '-Wno-unknown-warning-option', 110 '-Wno-unknown-warning-option',
111 ], 111 ],
112 }], 112 }],
113 ], 113 ],
114 }], 114 }],
115 ], 115 ],
116 }, 116 },
117 'export_dependent_settings': [ 117 'export_dependent_settings': [
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 'target_name': 'gmock_all_tests', 197 'target_name': 'gmock_all_tests',
198 'type': 'none', 198 'type': 'none',
199 'dependencies': [ 199 'dependencies': [
200 'gmock_all_test', 200 'gmock_all_test',
201 'gmock_link_test', 201 'gmock_link_test',
202 'gmock_stress_test', 202 'gmock_stress_test',
203 ], 203 ],
204 }, 204 },
205 ], 205 ],
206 } 206 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698