| Index: mojo/mojo.gyp
|
| diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
|
| index 7546219434454f9843afd2b20873c0159b467e75..9b3290f263041fd93624862cbce35606657dd14c 100644
|
| --- a/mojo/mojo.gyp
|
| +++ b/mojo/mojo.gyp
|
| @@ -63,7 +63,6 @@
|
| },
|
| {
|
| 'target_name': 'mojo_system',
|
| - # TODO(vtl): This should probably be '<(component)'; make it work.
|
| 'type': '<(component)',
|
| 'dependencies': [
|
| '../base/base.gyp:base',
|
| @@ -139,6 +138,7 @@
|
| '../net/net.gyp:net',
|
| '../url/url.gyp:url_lib',
|
| 'mojo_system',
|
| + 'native_viewport',
|
| ],
|
| 'sources': [
|
| 'shell/app_container.cc',
|
| @@ -194,7 +194,6 @@
|
| 'target_name': 'sample_app',
|
| 'type': 'shared_library',
|
| 'dependencies': [
|
| - '../base/base.gyp:base',
|
| 'mojo_system',
|
| ],
|
| 'sources': [
|
| @@ -237,6 +236,20 @@
|
| 'public/bindings/sample/sample_test.cc',
|
| ],
|
| },
|
| + {
|
| + 'target_name': 'native_viewport',
|
| + 'type': 'static_library',
|
| + 'dependencies': [
|
| + '../base/base.gyp:base',
|
| + '../ui/gfx/gfx.gyp:gfx',
|
| + '../ui/events/events.gyp:events'
|
| + ],
|
| + 'sources': [
|
| + 'services/native_viewport/native_viewport.h',
|
| + 'services/native_viewport/native_viewport_delegate.h',
|
| + 'services/native_viewport/native_viewport_win.cc',
|
| + ],
|
| + },
|
| ],
|
| 'conditions': [
|
| ['OS=="android"', {
|
|
|