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

Side by Side Diff: third_party/WebKit/public/blink.gyp

Issue 2102183002: Fix dependency issue in content_common (gyp) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 4 years, 5 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
« no previous file with comments | « content/content_common.gypi ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # 1 #
2 # Copyright (C) 2013 Google Inc. All rights reserved. 2 # Copyright (C) 2013 Google Inc. All rights reserved.
3 # 3 #
4 # Redistribution and use in source and binary forms, with or without 4 # Redistribution and use in source and binary forms, with or without
5 # modification, are permitted provided that the following conditions are 5 # modification, are permitted provided that the following conditions are
6 # met: 6 # met:
7 # 7 #
8 # * Redistributions of source code must retain the above copyright 8 # * Redistributions of source code must retain the above copyright
9 # notice, this list of conditions and the following disclaimer. 9 # notice, this list of conditions and the following disclaimer.
10 # * Redistributions in binary form must reproduce the above 10 # * Redistributions in binary form must reproduce the above
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 'dependencies' : [ 146 'dependencies' : [
147 '<(DEPTH)/cc/ipc/cc_ipc.gyp:interfaces', 147 '<(DEPTH)/cc/ipc/cc_ipc.gyp:interfaces',
148 ], 148 ],
149 'includes': [ 149 'includes': [
150 '../../../mojo/mojom_bindings_generator_explicit.gypi', 150 '../../../mojo/mojom_bindings_generator_explicit.gypi',
151 ], 151 ],
152 }, 152 },
153 { 153 {
154 # GN version: //third_party/WebKit/public:mojo_bindings 154 # GN version: //third_party/WebKit/public:mojo_bindings
155 'target_name': 'mojo_bindings', 155 'target_name': 'mojo_bindings',
156 # Needed because of dependency on generated headers.
157 'hard_dependency': '1',
156 'type': 'static_library', 158 'type': 'static_library',
157 'dependencies': [ 159 'dependencies': [
158 'mojo_bindings_blink_mojom', 160 'mojo_bindings_blink_mojom',
159 'mojo_bindings_mojom', 161 'mojo_bindings_mojom',
160 '../../../mojo/mojo_public.gyp:mojo_cpp_bindings', 162 '../../../mojo/mojo_public.gyp:mojo_cpp_bindings',
161 '../../../device/bluetooth/bluetooth.gyp:bluetooth_mojom', 163 '../../../device/bluetooth/bluetooth.gyp:bluetooth_mojom',
162 '<(DEPTH)/cc/ipc/cc_ipc.gyp:interfaces', 164 '<(DEPTH)/cc/ipc/cc_ipc.gyp:interfaces',
163 '<(DEPTH)/cc/ipc/cc_ipc.gyp:interfaces_blink', 165 '<(DEPTH)/cc/ipc/cc_ipc.gyp:interfaces_blink',
164 ], 166 ],
165 }, 167 },
(...skipping 17 matching lines...) Expand all
183 'type': 'static_library', 185 'type': 'static_library',
184 'dependencies': [ 186 'dependencies': [
185 'android_mojo_bindings_mojom', 187 'android_mojo_bindings_mojom',
186 '../../../mojo/mojo_public.gyp:mojo_bindings_java', 188 '../../../mojo/mojo_public.gyp:mojo_bindings_java',
187 ], 189 ],
188 }, 190 },
189 ], 191 ],
190 }], 192 }],
191 ], 193 ],
192 } 194 }
OLDNEW
« no previous file with comments | « content/content_common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698