| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 # Essential components (and their tests) that are needed to build | 5 # Essential components (and their tests) that are needed to build |
| 6 # Chrome should be here. Other components that are useful only in | 6 # Chrome should be here. Other components that are useful only in |
| 7 # Mojo land like mojo_shell should be in mojo.gyp. | 7 # Mojo land like mojo_shell should be in mojo.gyp. |
| 8 { | 8 { |
| 9 'includes': [ | 9 'includes': [ |
| 10 '../third_party/mojo/mojo_variables.gypi', | 10 '../third_party/mojo/mojo_variables.gypi', |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 ], | 76 ], |
| 77 'export_dependent_settings': [ | 77 'export_dependent_settings': [ |
| 78 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic
_annotations', | 78 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic
_annotations', |
| 79 ], | 79 ], |
| 80 'sources': [ | 80 'sources': [ |
| 81 'common/url_type_converters.cc', | 81 'common/url_type_converters.cc', |
| 82 'common/url_type_converters.h', | 82 'common/url_type_converters.h', |
| 83 ], | 83 ], |
| 84 }, | 84 }, |
| 85 { | 85 { |
| 86 # GN version: //mojo/converters/geometry |
| 87 'target_name': 'mojo_geometry_lib', |
| 88 'type': '<(component)', |
| 89 'defines': [ |
| 90 'MOJO_GEOMETRY_IMPLEMENTATION', |
| 91 ], |
| 92 'dependencies': [ |
| 93 '../third_party/mojo_services/mojo_services_public.gyp:mojo_geometry_bin
dings', |
| 94 '../ui/gfx/gfx.gyp:gfx_geometry', |
| 95 'mojo_environment_chromium', |
| 96 '<(mojo_system_for_component)', |
| 97 ], |
| 98 'sources': [ |
| 99 'converters/geometry/geometry_type_converters.cc', |
| 100 'converters/geometry/geometry_type_converters.h', |
| 101 'converters/geometry/mojo_geometry_export.h', |
| 102 ], |
| 103 }, |
| 104 { |
| 86 # GN version: //mojo/common:mojo_common_unittests | 105 # GN version: //mojo/common:mojo_common_unittests |
| 87 'target_name': 'mojo_common_unittests', | 106 'target_name': 'mojo_common_unittests', |
| 88 'type': 'executable', | 107 'type': 'executable', |
| 89 'dependencies': [ | 108 'dependencies': [ |
| 90 '../base/base.gyp:base', | 109 '../base/base.gyp:base', |
| 91 '../base/base.gyp:test_support_base', | 110 '../base/base.gyp:test_support_base', |
| 92 '../base/base.gyp:base_message_loop_tests', | 111 '../base/base.gyp:base_message_loop_tests', |
| 93 '../testing/gtest.gyp:gtest', | 112 '../testing/gtest.gyp:gtest', |
| 94 '../url/url.gyp:url_lib', | 113 '../url/url.gyp:url_lib', |
| 95 'mojo_common_lib', | 114 'mojo_common_lib', |
| (...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 239 ], | 258 ], |
| 240 'variables': { | 259 'variables': { |
| 241 'java_in_dir': '<(DEPTH)/mojo/android/system', | 260 'java_in_dir': '<(DEPTH)/mojo/android/system', |
| 242 }, | 261 }, |
| 243 'includes': [ '../build/java.gypi' ], | 262 'includes': [ '../build/java.gypi' ], |
| 244 }, | 263 }, |
| 245 ] | 264 ] |
| 246 }] | 265 }] |
| 247 ] | 266 ] |
| 248 } | 267 } |
| OLD | NEW |