Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 29 matching lines...) Expand all Loading... | |
| 40 'platform/modules/geolocation/geolocation.mojom', | 40 'platform/modules/geolocation/geolocation.mojom', |
| 41 'platform/modules/imagecapture/image_capture.mojom', | 41 'platform/modules/imagecapture/image_capture.mojom', |
| 42 'platform/modules/notifications/notification.mojom', | 42 'platform/modules/notifications/notification.mojom', |
| 43 'platform/modules/notifications/notification_service.mojom', | 43 'platform/modules/notifications/notification_service.mojom', |
| 44 'platform/modules/permissions/permission.mojom', | 44 'platform/modules/permissions/permission.mojom', |
| 45 'platform/modules/permissions/permission_status.mojom', | 45 'platform/modules/permissions/permission_status.mojom', |
| 46 'platform/modules/presentation/presentation.mojom', | 46 'platform/modules/presentation/presentation.mojom', |
| 47 'platform/modules/serviceworker/service_worker_event_status.mojom', | 47 'platform/modules/serviceworker/service_worker_event_status.mojom', |
| 48 'platform/modules/vr/vr_service.mojom', | 48 'platform/modules/vr/vr_service.mojom', |
| 49 'platform/modules/wake_lock/wake_lock_service.mojom', | 49 'platform/modules/wake_lock/wake_lock_service.mojom', |
| 50 'platform/resource_hints.mojom', | |
| 50 ], | 51 ], |
| 51 # Duplicated in GN: //third_party/WebKit/public:android_mojo_bindings | 52 # Duplicated in GN: //third_party/WebKit/public:android_mojo_bindings |
| 52 'blink_android_mojo_sources': [ | 53 'blink_android_mojo_sources': [ |
| 53 'platform/modules/payments/payment_request.mojom', | 54 'platform/modules/payments/payment_request.mojom', |
| 54 ], | 55 ], |
| 55 }, | 56 }, |
| 56 'targets': [ | 57 'targets': [ |
| 57 { | 58 { |
| 58 # GN version: //third_party/WebKit/public:blink | 59 # GN version: //third_party/WebKit/public:blink |
| 59 'target_name': 'blink', | 60 'target_name': 'blink', |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 137 }, | 138 }, |
| 138 { | 139 { |
| 139 # GN version: //third_party/WebKit/public:mojo_bindings | 140 # GN version: //third_party/WebKit/public:mojo_bindings |
| 140 'target_name': 'mojo_bindings', | 141 'target_name': 'mojo_bindings', |
| 141 'type': 'static_library', | 142 'type': 'static_library', |
| 142 'dependencies': [ | 143 'dependencies': [ |
| 143 'mojo_bindings_blink_mojom', | 144 'mojo_bindings_blink_mojom', |
| 144 'mojo_bindings_mojom', | 145 'mojo_bindings_mojom', |
| 145 '../../../mojo/mojo_public.gyp:mojo_cpp_bindings', | 146 '../../../mojo/mojo_public.gyp:mojo_cpp_bindings', |
| 146 ], | 147 ], |
| 148 'variables': { | |
| 149 'mojom_typemaps': [ | |
|
Marijn Kruisselbrink
2016/06/07 20:22:25
You should add these typemaps to the mojo_bindings
Charlie Harrison
2016/06/08 12:28:20
Done.
| |
| 150 '../Source/platform/mojo/KURL.typemap', | |
| 151 ], | |
| 152 }, | |
| 147 }, | 153 }, |
| 148 ], | 154 ], |
| 149 'conditions': [ | 155 'conditions': [ |
| 150 ['OS == "android"', { | 156 ['OS == "android"', { |
| 151 'targets': [ | 157 'targets': [ |
| 152 { | 158 { |
| 153 'target_name': 'android_mojo_bindings_mojom', | 159 'target_name': 'android_mojo_bindings_mojom', |
| 154 'type': 'none', | 160 'type': 'none', |
| 155 'variables': { | 161 'variables': { |
| 156 'mojom_files': ['<@(blink_android_mojo_sources)'], | 162 'mojom_files': ['<@(blink_android_mojo_sources)'], |
| 157 }, | 163 }, |
| 158 'includes': [ | 164 'includes': [ |
| 159 '../../../mojo/mojom_bindings_generator_explicit.gypi', | 165 '../../../mojo/mojom_bindings_generator_explicit.gypi', |
| 160 ], | 166 ], |
| 161 }, | 167 }, |
| 162 { | 168 { |
| 163 # GN version: //third_party/WebKit/public:android_mojo_bindi ngs_java | 169 # GN version: //third_party/WebKit/public:android_mojo_bindi ngs_java |
| 164 'target_name': 'android_mojo_bindings_java', | 170 'target_name': 'android_mojo_bindings_java', |
| 165 'type': 'static_library', | 171 'type': 'static_library', |
| 166 'dependencies': [ | 172 'dependencies': [ |
| 167 'android_mojo_bindings_mojom', | 173 'android_mojo_bindings_mojom', |
| 168 '../../../mojo/mojo_public.gyp:mojo_bindings_java', | 174 '../../../mojo/mojo_public.gyp:mojo_bindings_java', |
| 169 ], | 175 ], |
| 170 }, | 176 }, |
| 171 ], | 177 ], |
| 172 }], | 178 }], |
| 173 ], | 179 ], |
| 174 } | 180 } |
| OLD | NEW |