Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1054)

Unified Diff: mojo/edk/mojo_edk.gyp

Issue 807773002: Move mojo gypfiles to toplevel mojo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ipc/mojo/ipc_mojo.gyp ('k') | mojo/edk/mojo_edk_system_impl.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/edk/mojo_edk.gyp
diff --git a/mojo/edk/mojo_edk.gyp b/mojo/edk/mojo_edk.gyp
deleted file mode 100644
index b85cae70e2be2259f28a41d73dce9b1a3b15ee03..0000000000000000000000000000000000000000
--- a/mojo/edk/mojo_edk.gyp
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 2014 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-{
- 'includes': [
- '../mojo_variables.gypi',
- ],
- 'targets': [
- {
- # GN version: //mojo/edk/system
- 'target_name': 'mojo_system_impl',
- 'type': '<(component)',
- 'dependencies': [
- '../../base/base.gyp:base',
- '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
- ],
- 'includes': [
- 'mojo_edk_system_impl.gypi',
- ],
- },
- {
- # GN version: //mojo/edk/js
- 'target_name': 'mojo_js_lib',
- 'type': 'static_library',
- 'dependencies': [
- '../../base/base.gyp:base',
- '../../gin/gin.gyp:gin',
- '../../v8/tools/gyp/v8.gyp:v8',
- ],
- 'export_dependent_settings': [
- '../../base/base.gyp:base',
- '../../gin/gin.gyp:gin',
- ],
- 'sources': [
- # Sources list duplicated in GN build.
- 'js/core.cc',
- 'js/core.h',
- 'js/drain_data.cc',
- 'js/drain_data.h',
- 'js/handle.cc',
- 'js/handle.h',
- 'js/handle_close_observer.h',
- 'js/mojo_runner_delegate.cc',
- 'js/mojo_runner_delegate.h',
- 'js/support.cc',
- 'js/support.h',
- 'js/threading.cc',
- 'js/threading.h',
- 'js/waiting_callback.cc',
- 'js/waiting_callback.h',
- ],
- },
- {
- # GN version: //mojo/edk/test:test_support_impl
- 'target_name': 'mojo_test_support_impl',
- 'type': 'static_library',
- 'dependencies': [
- '../../base/base.gyp:base',
- ],
- 'sources': [
- 'test/test_support_impl.cc',
- 'test/test_support_impl.h',
- ],
- },
- {
- # GN version: //mojo/edk/test:test_support
- 'target_name': 'mojo_common_test_support',
- 'type': 'static_library',
- 'dependencies': [
- '../../base/base.gyp:base',
- '../../base/base.gyp:test_support_base',
- '../../testing/gtest.gyp:gtest',
- 'mojo_system_impl',
- ],
- 'sources': [
- 'test/multiprocess_test_helper.cc',
- 'test/multiprocess_test_helper.h',
- 'test/test_utils.h',
- 'test/test_utils_posix.cc',
- 'test/test_utils_win.cc',
- ],
- 'conditions': [
- ['OS=="ios"', {
- 'sources!': [
- 'test/multiprocess_test_helper.cc',
- ],
- }],
- ],
- },
- {
- # GN version: //mojo/edk/test:run_all_unittests
- 'target_name': 'mojo_run_all_unittests',
- 'type': 'static_library',
- 'dependencies': [
- '../../base/base.gyp:base',
- '../../base/base.gyp:test_support_base',
- '../../testing/gtest.gyp:gtest',
- 'mojo_system_impl',
- 'mojo_test_support_impl',
- '../public/mojo_public.gyp:mojo_test_support',
- ],
- 'sources': [
- 'test/run_all_unittests.cc',
- ],
- },
- {
- # GN version: //mojo/edk/test:run_all_perftests
- 'target_name': 'mojo_run_all_perftests',
- 'type': 'static_library',
- 'dependencies': [
- '../../base/base.gyp:test_support_base',
- 'mojo_edk.gyp:mojo_system_impl',
- 'mojo_test_support_impl',
- '../public/mojo_public.gyp:mojo_test_support',
- ],
- 'sources': [
- 'test/run_all_perftests.cc',
- ],
- },
- ],
- 'conditions': [
- ['OS=="win" and target_arch=="ia32"', {
- 'targets': [
- {
- 'target_name': 'mojo_system_impl_win64',
- 'type': '<(component)',
- 'dependencies': [
- '../../base/base.gyp:base_win64',
- '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations_win64',
- ],
- 'includes': [
- 'mojo_edk_system_impl.gypi',
- ],
- 'configurations': {
- 'Common_Base': {
- 'msvs_target_platform': 'x64',
- },
- },
- },
- ],
- }],
- ],
-}
« no previous file with comments | « ipc/mojo/ipc_mojo.gyp ('k') | mojo/edk/mojo_edk_system_impl.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698