| Index: mojo/mojo.gyp
|
| diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
|
| index 6fdddf25cdacff85c72d7b6d8d7ace8713cf5749..68f944fc9e1c095bde521146d4bcf20bf7afb5e4 100644
|
| --- a/mojo/mojo.gyp
|
| +++ b/mojo/mojo.gyp
|
| @@ -66,14 +66,6 @@
|
| 'mojo_external_application_tests',
|
| ],
|
| }],
|
| - ['component != "shared_library" and OS == "linux"', {
|
| - 'dependencies': [
|
| - 'mojo_python_bindings',
|
| - 'mojo_python_embedder',
|
| - 'mojo_python_system',
|
| - 'mojo_python',
|
| - ],
|
| - }],
|
| ]
|
| },
|
| {
|
| @@ -585,135 +577,6 @@
|
| },
|
| ],
|
| }],
|
| - ['component!="shared_library" and OS=="linux"', {
|
| - 'targets': [
|
| - {
|
| - # GN version: //mojo/public/python:system
|
| - 'target_name': 'mojo_python_system',
|
| - 'variables': {
|
| - 'python_base_module': 'mojo',
|
| - 'python_cython_module': 'system',
|
| - },
|
| - 'sources': [
|
| - 'public/python/mojo/c_core.pxd',
|
| - 'public/python/mojo/c_environment.pxd',
|
| - 'public/python/mojo/system.pyx',
|
| - 'public/python/src/python_system_helper.cc',
|
| - 'public/python/src/python_system_helper.h',
|
| - ],
|
| - 'dependencies': [
|
| - 'public/mojo_public.gyp:mojo_environment_standalone',
|
| - 'public/mojo_public.gyp:mojo_system',
|
| - 'public/mojo_public.gyp:mojo_utility',
|
| - ],
|
| - 'includes': [ '../third_party/cython/cython_compiler.gypi' ],
|
| - },
|
| - {
|
| - # GN version: //mojo/python:embedder
|
| - 'target_name': 'mojo_python_embedder',
|
| - 'type': 'loadable_module',
|
| - 'variables': {
|
| - 'python_base_module': 'mojo',
|
| - 'python_cython_module': 'embedder',
|
| - },
|
| - 'sources': [
|
| - 'python/system/mojo/embedder.pyx',
|
| - ],
|
| - 'dependencies': [
|
| - 'edk/mojo_edk.gyp:mojo_system_impl',
|
| - ],
|
| - 'includes': [ '../third_party/cython/cython_compiler.gypi' ],
|
| - },
|
| - {
|
| - # GN version: //mojo/public/python:bindings
|
| - 'target_name': 'mojo_python_bindings',
|
| - 'type': 'none',
|
| - 'variables': {
|
| - 'python_base_module': 'mojo/bindings',
|
| - },
|
| - 'sources': [
|
| - 'public/python/mojo/bindings/__init__.py',
|
| - 'public/python/mojo/bindings/descriptor.py',
|
| - 'public/python/mojo/bindings/messaging.py',
|
| - 'public/python/mojo/bindings/promise.py',
|
| - 'public/python/mojo/bindings/reflection.py',
|
| - 'public/python/mojo/bindings/serialization.py',
|
| - ],
|
| - 'dependencies': [
|
| - 'mojo_python_system',
|
| - ],
|
| - 'includes': [ '../third_party/cython/python_module.gypi' ],
|
| - },
|
| - {
|
| - # GN version: //mojo/python
|
| - 'target_name': 'mojo_python',
|
| - 'type': 'none',
|
| - 'variables': {
|
| - 'python_base_module': 'mojo',
|
| - },
|
| - 'sources': [
|
| - 'public/python/mojo/__init__.py',
|
| - ],
|
| - 'dependencies': [
|
| - 'mojo_python_bindings',
|
| - 'mojo_python_embedder',
|
| - 'mojo_python_system',
|
| - ],
|
| - # The python module need to be copied to their destinations
|
| - 'actions': [
|
| - {
|
| - 'action_name': 'Copy system module.',
|
| - 'inputs': [
|
| - '<(DEPTH)/build/cp.py',
|
| - '<(PRODUCT_DIR)/libmojo_python_system.so',
|
| - ],
|
| - 'outputs': [
|
| - '<(PRODUCT_DIR)/python/mojo/system.so',
|
| - ],
|
| - 'action': [
|
| - 'python',
|
| - '<@(_inputs)',
|
| - '<@(_outputs)',
|
| - ]
|
| - },
|
| - {
|
| - 'action_name': 'Copy embedder module.',
|
| - 'inputs': [
|
| - '<(DEPTH)/build/cp.py',
|
| - '<(PRODUCT_DIR)/libmojo_python_embedder.so',
|
| - ],
|
| - 'outputs': [
|
| - '<(PRODUCT_DIR)/python/mojo/embedder.so',
|
| - ],
|
| - 'action': [
|
| - 'python',
|
| - '<@(_inputs)',
|
| - '<@(_outputs)',
|
| - ]
|
| - },
|
| - ],
|
| - 'includes': [ '../third_party/cython/python_module.gypi' ],
|
| - },
|
| - ],
|
| - }],
|
| - ['component!="shared_library" and OS=="linux" and test_isolation_mode!="noop"', {
|
| - 'targets': [
|
| - {
|
| - 'target_name': 'mojo_python_unittests_run',
|
| - 'type': 'none',
|
| - 'dependencies': [
|
| - 'mojo_python',
|
| - 'public/mojo_public.gyp:mojo_public_test_interfaces',
|
| - ],
|
| - 'includes': [
|
| - '../build/isolate.gypi',
|
| - ],
|
| - 'sources': [
|
| - 'mojo_python_unittests.isolate',
|
| - ],
|
| - },
|
| - ],
|
| - }],
|
| ['test_isolation_mode != "noop"', {
|
| 'targets': [
|
| {
|
|
|