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

Side by Side Diff: trunk/src/mojo/mojo_services.gypi

Issue 326603002: Revert 275652 "Remove unneeded JNI registrations." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « trunk/src/mojo/mojo_public.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 'targets': [ 2 'targets': [
3 { 3 {
4 'target_name': 'mojo_echo_bindings', 4 'target_name': 'mojo_echo_bindings',
5 'type': 'static_library', 5 'type': 'static_library',
6 'sources': [ 6 'sources': [
7 'services/dbus_echo/echo.mojom', 7 'services/dbus_echo/echo.mojom',
8 ], 8 ],
9 'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ], 9 'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
10 'export_dependent_settings': [ 10 'export_dependent_settings': [
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 'conditions': [ 172 'conditions': [
173 ['OS=="win" or OS=="android" or OS=="linux" or OS=="mac"', { 173 ['OS=="win" or OS=="android" or OS=="linux" or OS=="mac"', {
174 'sources!': [ 174 'sources!': [
175 'services/native_viewport/native_viewport_stub.cc', 175 'services/native_viewport/native_viewport_stub.cc',
176 ], 176 ],
177 }], 177 }],
178 ['OS=="android"', { 178 ['OS=="android"', {
179 'dependencies': [ 179 'dependencies': [
180 'mojo_jni_headers', 180 'mojo_jni_headers',
181 ], 181 ],
182 'ldflags!': [
183 # Remove default export list because this lib has different exports.
184 '-Wl,--version-script=<(android_linker_script)',
185 ],
186 'ldflags': [
187 # Don't export symbols from statically linked libraries.
188 '-Wl,--exclude-libs=ALL',
189 ],
190 }], 182 }],
191 ], 183 ],
192 }, 184 },
193 { 185 {
194 'target_name': 'mojo_network_bindings', 186 'target_name': 'mojo_network_bindings',
195 'type': 'static_library', 187 'type': 'static_library',
196 'sources': [ 188 'sources': [
197 'services/public/interfaces/network/network_error.mojom', 189 'services/public/interfaces/network/network_error.mojom',
198 'services/public/interfaces/network/network_service.mojom', 190 'services/public/interfaces/network/network_service.mojom',
199 'services/public/interfaces/network/url_loader.mojom', 191 'services/public/interfaces/network/url_loader.mojom',
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
458 'mojo_system_impl', 450 'mojo_system_impl',
459 ], 451 ],
460 'sources': [ 452 'sources': [
461 'services/dbus_echo/dbus_echo_service.cc', 453 'services/dbus_echo/dbus_echo_service.cc',
462 ], 454 ],
463 }, 455 },
464 ], 456 ],
465 }], 457 }],
466 ], 458 ],
467 } 459 }
OLDNEW
« no previous file with comments | « trunk/src/mojo/mojo_public.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698