| OLD | NEW |
|---|
| 1 { | 1 { |
| 2 'targets': [ | 2 'targets': [ |
| 3 { | 3 { |
| 4 'target_name': 'mojo_system', | 4 'target_name': 'mojo_system', |
| 5 'type': 'static_library', | 5 'type': 'static_library', |
| 6 'defines': [ | 6 'defines': [ |
| 7 'MOJO_SYSTEM_IMPLEMENTATION', | 7 'MOJO_SYSTEM_IMPLEMENTATION', |
| 8 ], | 8 ], |
| 9 'include_dirs': [ | 9 'include_dirs': [ |
| 10 '..', | 10 '..', |
| (...skipping 406 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 417 'conditions': [ | 417 'conditions': [ |
| 418 ['OS == "android"', { | 418 ['OS == "android"', { |
| 419 'targets': [ | 419 'targets': [ |
| 420 { | 420 { |
| 421 'target_name': 'mojo_public_java', | 421 'target_name': 'mojo_public_java', |
| 422 'type': 'none', | 422 'type': 'none', |
| 423 'variables': { | 423 'variables': { |
| 424 'java_in_dir': 'public/java', | 424 'java_in_dir': 'public/java', |
| 425 }, | 425 }, |
| 426 'includes': [ '../build/java.gypi' ], | 426 'includes': [ '../build/java.gypi' ], |
| 427 'conditions': [ | |
| 428 ['android_webview_build==0', { | |
| 429 'dependencies': [ | |
| 430 '../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib', | |
| 431 ], | |
| 432 }] | |
| 433 ], | |
| 434 }, | 427 }, |
| 435 { | 428 { |
| 436 'target_name': 'mojo_bindings_java', | 429 'target_name': 'mojo_bindings_java', |
| 437 'type': 'none', | 430 'type': 'none', |
| 438 'variables': { | 431 'variables': { |
| 439 'java_in_dir': 'bindings/java', | 432 'java_in_dir': 'bindings/java', |
| 440 }, | 433 }, |
| 441 'dependencies': [ | 434 'dependencies': [ |
| 442 'mojo_public_java', | 435 'mojo_public_java', |
| 443 ], | 436 ], |
| 444 'includes': [ '../build/java.gypi' ], | 437 'includes': [ '../build/java.gypi' ], |
| 445 }, | 438 }, |
| 446 ], | 439 ], |
| 447 }], | 440 }], |
| 448 ], | 441 ], |
| 449 } | 442 } |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 385113005:
Remove @Nullable annoation on readAndDispatchMessage (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src