| Index: mojo/mojo.gyp
|
| diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
|
| index e3c769f4668001a8c40949d6207a20f42c9bdaeb..27852416ea9ed84c5e81405a73668a3287c8d12e 100644
|
| --- a/mojo/mojo.gyp
|
| +++ b/mojo/mojo.gyp
|
| @@ -19,6 +19,9 @@
|
| 'mojo_services.gypi',
|
| 'mojo_variables.gypi',
|
| ],
|
| + 'variables': {
|
| + 'use_prebuilt_mojo_shell%': 0,
|
| + },
|
| 'targets': [
|
| {
|
| # GN version: //mojo
|
| @@ -211,27 +214,6 @@
|
| ],
|
| },
|
| {
|
| - # GN version: //mojo/shell
|
| - 'target_name': 'mojo_shell',
|
| - 'type': 'executable',
|
| - 'dependencies': [
|
| - '../base/base.gyp:base',
|
| - 'mojo_base.gyp:mojo_common_lib',
|
| - 'mojo_base.gyp:mojo_environment_chromium',
|
| - 'mojo_shell_lib',
|
| - ],
|
| - 'sources': [
|
| - 'shell/desktop/mojo_main.cc',
|
| - ],
|
| - 'conditions': [
|
| - ['component=="shared_library"', {
|
| - 'dependencies': [
|
| - '../ui/gfx/gfx.gyp:gfx',
|
| - ],
|
| - }],
|
| - ],
|
| - },
|
| - {
|
| # GN version: //mojo/shell:mojo_shell_tests
|
| 'target_name': 'mojo_shell_tests',
|
| 'type': '<(gtest_target_type)',
|
| @@ -416,6 +398,45 @@
|
| },
|
| ],
|
| 'conditions': [
|
| + ['<(use_prebuilt_mojo_shell)==1', {
|
| + 'targets': [
|
| + {
|
| + # GN version: //mojo/public/tools:mojo_shell
|
| + 'target_name': 'mojo_shell',
|
| + 'type': 'none',
|
| + 'copies': [{
|
| + 'destination': '<(PRODUCT_DIR)',
|
| + 'files': [
|
| + 'public/tools/prebuilt/mojo_shell',
|
| + ],
|
| + }],
|
| + },
|
| + ]
|
| + }, { # use_prebuilt_mojo_shell != 1
|
| + 'targets': [
|
| + {
|
| + # GN version: //mojo/shell
|
| + 'target_name': 'mojo_shell',
|
| + 'type': 'executable',
|
| + 'dependencies': [
|
| + '../base/base.gyp:base',
|
| + 'mojo_base.gyp:mojo_common_lib',
|
| + 'mojo_base.gyp:mojo_environment_chromium',
|
| + 'mojo_shell_lib',
|
| + ],
|
| + 'sources': [
|
| + 'shell/desktop/mojo_main.cc',
|
| + ],
|
| + 'conditions': [
|
| + ['component=="shared_library"', {
|
| + 'dependencies': [
|
| + '../ui/gfx/gfx.gyp:gfx',
|
| + ],
|
| + }],
|
| + ],
|
| + },
|
| + ],
|
| + }],
|
| ['OS=="android"', {
|
| 'targets': [
|
| {
|
|
|