diff options
author | mtklein <mtklein@chromium.org> | 2016-04-14 09:42:34 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-04-14 09:42:34 -0700 |
commit | fbcfd6d060f4d42e6b9de70f676564fcf1d97eb5 (patch) | |
tree | 9dc94a618eebc067b7c3af06fa0769ba926da42b /gyp | |
parent | ccb0de64f38d05522353fcdcbd51a063c1d29b08 (diff) |
mojo -> nojo
BUG=skia:4891
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1889543003
Review URL: https://codereview.chromium.org/1889543003
Diffstat (limited to 'gyp')
-rw-r--r-- | gyp/common_variables.gypi | 2 | ||||
-rw-r--r-- | gyp/dm.gypi | 1 | ||||
-rw-r--r-- | gyp/skmojo.gyp | 89 |
3 files changed, 0 insertions, 92 deletions
diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi index 7275de238e..26dadeb168 100644 --- a/gyp/common_variables.gypi +++ b/gyp/common_variables.gypi @@ -38,8 +38,6 @@ 'variables': { # level 1 'angle_path%': '../', - 'skia_mojo%': '0', - 'variables': { # level 2 # Variables needed by conditions list within the level-2 variables dict. 'variables': { # level 3 diff --git a/gyp/dm.gypi b/gyp/dm.gypi index 5a75d85c8c..337bcccd7c 100644 --- a/gyp/dm.gypi +++ b/gyp/dm.gypi @@ -52,6 +52,5 @@ [ 'skia_gpu == 1', { 'dependencies': [ 'gputest.gyp:skgputest' ], }], - [ 'skia_mojo', { 'dependencies': [ 'skmojo.gyp:skmojo' ], } ], ], } diff --git a/gyp/skmojo.gyp b/gyp/skmojo.gyp deleted file mode 100644 index 0bd6f2c156..0000000000 --- a/gyp/skmojo.gyp +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 2016 Google Inc. -# -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. -{ - 'targets': [ - { - 'target_name': 'mojo', - 'type': 'static_library', - 'variables': { 'mojo_parent_dir': '../third_party/externals' }, - 'include_dirs': [ '<(mojo_parent_dir)' ], - 'all_dependent_settings': { 'include_dirs': [ '<(mojo_parent_dir)' ] }, - 'xcode_settings': { 'OTHER_CFLAGS': [ '-w' ], }, - 'sources': [ - '<!@(python find.py <(mojo_parent_dir)/mojo/public/cpp "*.cc")', - '<(mojo_parent_dir)/mojo/public/platform/native/system_thunks.c', - '<(mojo_parent_dir)/mojo/public/interfaces/application/application.mojom.cc', - '<(mojo_parent_dir)/mojo/public/interfaces/application/application.mojom.h', - '<(mojo_parent_dir)/mojo/public/interfaces/application/service_provider.mojom.cc', - '<(mojo_parent_dir)/mojo/public/interfaces/application/service_provider.mojom.h', - '<(mojo_parent_dir)/mojo/public/interfaces/bindings/interface_control_messages.mojom.cc', - '<(mojo_parent_dir)/mojo/public/interfaces/bindings/interface_control_messages.mojom.h', - '<(mojo_parent_dir)/mojo/public/interfaces/bindings/tests/ping_service.mojom.cc', - '<(mojo_parent_dir)/mojo/public/interfaces/bindings/tests/ping_service.mojom.h', - ], - 'sources!': [ - '<!@(python find.py <(mojo_parent_dir)/mojo/public/cpp "*_unittest.cc")', - '<!@(python find.py <(mojo_parent_dir)/mojo/public/cpp "*_perftest.cc")', - '<!@(python find.py <(mojo_parent_dir)/mojo/public/cpp "*_apptest.cc")', - '<!@(python find.py <(mojo_parent_dir)/mojo/public/cpp "*_test_*.cc")', - '<!@(python find.py <(mojo_parent_dir)/mojo/public/cpp "*_win.cc")', - ], - 'actions':[ - { - 'action_name': 'generate_from_mojoms', - 'inputs': [ - '../experimental/mojo/generate.py', - '<(mojo_parent_dir)/mojo/public/tools/bindings/mojom_parser/bin/linux64/mojom_parser.sha1', - '<(mojo_parent_dir)/mojo/public/tools/bindings/mojom_parser/bin/mac64/mojom_parser.sha1', - '<(mojo_parent_dir)/mojo/public/tools/bindings/mojom_bindings_generator.py', - '<(mojo_parent_dir)/mojo/public/interfaces/bindings/interface_control_messages.mojom', - '<(mojo_parent_dir)/mojo/public/interfaces/application/service_provider.mojom', - '<(mojo_parent_dir)/mojo/public/interfaces/bindings/tests/ping_service.mojom', - '<(mojo_parent_dir)/mojo/public/interfaces/application/application.mojom', - ], - 'outputs': [ - '<(mojo_parent_dir)/mojo/public/interfaces/application/application.mojom.cc', - '<(mojo_parent_dir)/mojo/public/interfaces/application/application.mojom.h', - '<(mojo_parent_dir)/mojo/public/interfaces/application/service_provider.mojom.cc', - '<(mojo_parent_dir)/mojo/public/interfaces/application/service_provider.mojom.h', - '<(mojo_parent_dir)/mojo/public/interfaces/bindings/interface_control_messages.mojom.cc', - '<(mojo_parent_dir)/mojo/public/interfaces/bindings/interface_control_messages.mojom.h', - '<(mojo_parent_dir)/mojo/public/interfaces/bindings/tests/ping_service.mojom.cc', - '<(mojo_parent_dir)/mojo/public/interfaces/bindings/tests/ping_service.mojom.h', - ], - 'action': ['python', '../experimental/mojo/generate.py'] - }, - ], }, - { - 'target_name': 'skmojo', - 'type': 'static_library', - 'variables': { - 'mojo_dir': '../third_party/externals/mojo/public' - }, - 'dependencies': [ 'mojo' ], - 'defines': [ 'SK_MOJO' ], - 'sources': [ '../experimental/mojo/SkMojo.mojom.cc', ], - 'include_dirs': [ '../experimental/mojo', ], - 'all_dependent_settings': { - 'include_dirs': [ '../experimental/mojo' ], - 'defines': [ 'SK_MOJO' ], - }, - 'actions':[ - { - 'action_name': 'generate_from_mojoms', - 'inputs': [ - '../experimental/mojo/generate.py', - '../experimental/mojo/SkMojo.mojom', - ], - 'outputs': [ - '../experimental/mojo/SkMojo.mojom.h', - '../experimental/mojo/SkMojo.mojom.cc' - ], - 'action': ['python', '../experimental/mojo/generate.py', '../experimental/mojo/SkMojo.mojom'] - }, - ], - }, - ], -} |