diff options
42 files changed, 49 insertions, 198 deletions
diff --git a/components/clipboard/BUILD.gn b/components/clipboard/BUILD.gn index 336db09..74a391d 100644 --- a/components/clipboard/BUILD.gn +++ b/components/clipboard/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//third_party/mojo/src/mojo/public/mojo_application.gni") +import("//mojo/public/mojo_application.gni") source_set("lib") { sources = [ diff --git a/components/clipboard/public/interfaces/BUILD.gn b/components/clipboard/public/interfaces/BUILD.gn index 6ee9bb7..7bca33b 100644 --- a/components/clipboard/public/interfaces/BUILD.gn +++ b/components/clipboard/public/interfaces/BUILD.gn @@ -2,7 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/module_args/mojo.gni") import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") mojom("interfaces") { diff --git a/components/devtools_service/BUILD.gn b/components/devtools_service/BUILD.gn index 1dc5c46..12d74fc 100644 --- a/components/devtools_service/BUILD.gn +++ b/components/devtools_service/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//third_party/mojo/src/mojo/public/mojo_application.gni") +import("//mojo/public/mojo_application.gni") source_set("lib") { sources = [ diff --git a/components/devtools_service/public/interfaces/BUILD.gn b/components/devtools_service/public/interfaces/BUILD.gn index db42b1a..3b54773 100644 --- a/components/devtools_service/public/interfaces/BUILD.gn +++ b/components/devtools_service/public/interfaces/BUILD.gn @@ -2,7 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/module_args/mojo.gni") import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") mojom("interfaces") { diff --git a/components/filesystem/BUILD.gn b/components/filesystem/BUILD.gn index 26e9d06..7579c0c 100644 --- a/components/filesystem/BUILD.gn +++ b/components/filesystem/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//third_party/mojo/src/mojo/public/mojo_application.gni") +import("//mojo/public/mojo_application.gni") source_set("lib") { sources = [ diff --git a/components/filesystem/public/interfaces/BUILD.gn b/components/filesystem/public/interfaces/BUILD.gn index a5128c3..139ef49 100644 --- a/components/filesystem/public/interfaces/BUILD.gn +++ b/components/filesystem/public/interfaces/BUILD.gn @@ -2,7 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/module_args/mojo.gni") import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") mojom("interfaces") { diff --git a/components/gpu/public/interfaces/BUILD.gn b/components/gpu/public/interfaces/BUILD.gn index 151272b..a5f246d 100644 --- a/components/gpu/public/interfaces/BUILD.gn +++ b/components/gpu/public/interfaces/BUILD.gn @@ -2,7 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/module_args/mojo.gni") import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") mojom("interfaces") { diff --git a/components/html_viewer/BUILD.gn b/components/html_viewer/BUILD.gn index 2d79209..0538220 100644 --- a/components/html_viewer/BUILD.gn +++ b/components/html_viewer/BUILD.gn @@ -4,9 +4,8 @@ import("//build/module_args/v8.gni") import("//mojo/mojo_application_package.gni") +import("//mojo/public/mojo_application.gni") import("//testing/test.gni") -import("//third_party/mojo/src/mojo/public/mojo.gni") -import("//third_party/mojo/src/mojo/public/mojo_application.gni") import("//tools/grit/grit_rule.gni") import("//tools/grit/repack.gni") diff --git a/components/resource_provider/BUILD.gn b/components/resource_provider/BUILD.gn index 48a0749..aea501a 100644 --- a/components/resource_provider/BUILD.gn +++ b/components/resource_provider/BUILD.gn @@ -3,8 +3,8 @@ # found in the LICENSE file. import("//mojo/mojo_application_package.gni") +import("//mojo/public/mojo_application.gni") import("//testing/test.gni") -import("//third_party/mojo/src/mojo/public/mojo_application.gni") if (is_android) { import("//build/config/android/rules.gni") diff --git a/components/resource_provider/public/cpp/BUILD.gn b/components/resource_provider/public/cpp/BUILD.gn index c89c982..ad13d1f 100644 --- a/components/resource_provider/public/cpp/BUILD.gn +++ b/components/resource_provider/public/cpp/BUILD.gn @@ -2,9 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/module_args/mojo.gni") -import("//third_party/mojo/src/mojo/public/mojo_sdk.gni") - source_set("cpp") { sources = [ "resource_loader.cc", diff --git a/components/resource_provider/public/interfaces/BUILD.gn b/components/resource_provider/public/interfaces/BUILD.gn index d3cb620..d99f3c2 100644 --- a/components/resource_provider/public/interfaces/BUILD.gn +++ b/components/resource_provider/public/interfaces/BUILD.gn @@ -2,7 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/module_args/mojo.gni") import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") mojom("interfaces") { diff --git a/components/view_manager/BUILD.gn b/components/view_manager/BUILD.gn index 44b2bc3..e91eec3 100644 --- a/components/view_manager/BUILD.gn +++ b/components/view_manager/BUILD.gn @@ -4,7 +4,7 @@ import("//build/config/ui.gni") import("//testing/test.gni") -import("//third_party/mojo/src/mojo/public/mojo_application.gni") +import("//mojo/public/mojo_application.gni") if (is_android) { import("//build/config/android/config.gni") diff --git a/components/view_manager/gles2/BUILD.gn b/components/view_manager/gles2/BUILD.gn index 29bd071..6af69d0 100644 --- a/components/view_manager/gles2/BUILD.gn +++ b/components/view_manager/gles2/BUILD.gn @@ -2,8 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") - source_set("gles2") { visibility = [ "//components/view_manager/native_viewport:*", diff --git a/components/view_manager/native_viewport/BUILD.gn b/components/view_manager/native_viewport/BUILD.gn index 123e40e..ae0014c 100644 --- a/components/view_manager/native_viewport/BUILD.gn +++ b/components/view_manager/native_viewport/BUILD.gn @@ -3,7 +3,6 @@ # found in the LICENSE file. import("//build/config/ui.gni") -import("//third_party/mojo/src/mojo/public/mojo_application.gni") source_set("native_viewport") { sources = [ diff --git a/components/view_manager/public/cpp/BUILD.gn b/components/view_manager/public/cpp/BUILD.gn index 6f7b216..565670e 100644 --- a/components/view_manager/public/cpp/BUILD.gn +++ b/components/view_manager/public/cpp/BUILD.gn @@ -2,7 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/module_args/mojo.gni") import("//third_party/mojo/src/mojo/public/mojo_sdk.gni") mojo_sdk_source_set("cpp") { diff --git a/components/view_manager/public/interfaces/BUILD.gn b/components/view_manager/public/interfaces/BUILD.gn index 09afdb9..2bc3f67 100644 --- a/components/view_manager/public/interfaces/BUILD.gn +++ b/components/view_manager/public/interfaces/BUILD.gn @@ -2,7 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/module_args/mojo.gni") import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") mojom("interfaces") { diff --git a/components/view_manager/surfaces/BUILD.gn b/components/view_manager/surfaces/BUILD.gn index d2e6d5e..308373a 100644 --- a/components/view_manager/surfaces/BUILD.gn +++ b/components/view_manager/surfaces/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//third_party/mojo/src/mojo/public/mojo_application.gni") +import("//mojo/public/mojo_application.gni") mojo_native_application("surfaces") { output_name = "surfaces_service" diff --git a/components/view_manager/surfaces/public/interfaces/BUILD.gn b/components/view_manager/surfaces/public/interfaces/BUILD.gn index f0150eb..3ee12d4 100644 --- a/components/view_manager/surfaces/public/interfaces/BUILD.gn +++ b/components/view_manager/surfaces/public/interfaces/BUILD.gn @@ -2,7 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/module_args/mojo.gni") import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") mojom("interfaces") { diff --git a/mandoline/app/BUILD.gn b/mandoline/app/BUILD.gn index e74aeb1..066842d 100644 --- a/mandoline/app/BUILD.gn +++ b/mandoline/app/BUILD.gn @@ -2,8 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//third_party/mojo/src/mojo/public/mojo.gni") - group("app") { deps = [ "//mandoline/ui", diff --git a/mandoline/app/android/BUILD.gn b/mandoline/app/android/BUILD.gn index be021ea..7798abe 100644 --- a/mandoline/app/android/BUILD.gn +++ b/mandoline/app/android/BUILD.gn @@ -4,7 +4,6 @@ assert(is_android) -import("//third_party/mojo/src/mojo/public/mojo.gni") import("//build/config/android/config.gni") import("//build/config/android/rules.gni") import("//mojo/generate_mojo_shell_assets_list.gni") diff --git a/mandoline/app/desktop/BUILD.gn b/mandoline/app/desktop/BUILD.gn index ce3e6ea..9c3d8e2 100644 --- a/mandoline/app/desktop/BUILD.gn +++ b/mandoline/app/desktop/BUILD.gn @@ -2,8 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//third_party/mojo/src/mojo/public/mojo.gni") - group("desktop") { deps = [ ":mandoline", diff --git a/mandoline/services/core_services/BUILD.gn b/mandoline/services/core_services/BUILD.gn index bec66ad..4c1ebf9 100644 --- a/mandoline/services/core_services/BUILD.gn +++ b/mandoline/services/core_services/BUILD.gn @@ -6,8 +6,7 @@ # we ship with. import("//build/config/ui.gni") -import("//third_party/mojo/src/mojo/public/mojo_application.gni") -import("//testing/test.gni") +import("//mojo/public/mojo_application.gni") if (is_android) { import("//build/config/android/rules.gni") diff --git a/mandoline/services/navigation/public/interfaces/BUILD.gn b/mandoline/services/navigation/public/interfaces/BUILD.gn index 5b5dca6..f86683d 100644 --- a/mandoline/services/navigation/public/interfaces/BUILD.gn +++ b/mandoline/services/navigation/public/interfaces/BUILD.gn @@ -3,7 +3,7 @@ # found in the LICENSE file. import("//build/module_args/mojo.gni") -import("$mojo_sdk_root/mojo/public/tools/bindings/mojom.gni") +import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") mojom("interfaces") { sources = [ diff --git a/mandoline/tab/BUILD.gn b/mandoline/tab/BUILD.gn index c52d60b..2ba6298 100644 --- a/mandoline/tab/BUILD.gn +++ b/mandoline/tab/BUILD.gn @@ -2,9 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//testing/test.gni") -import("//third_party/mojo/src/mojo/public/mojo_application.gni") -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") +import("//mojo/public/mojo_application.gni") source_set("tab") { sources = [ diff --git a/mandoline/ui/BUILD.gn b/mandoline/ui/BUILD.gn index 4cf2720..96f1734 100644 --- a/mandoline/ui/BUILD.gn +++ b/mandoline/ui/BUILD.gn @@ -3,7 +3,6 @@ # found in the LICENSE file. import("//build/config/ui.gni") -import("//third_party/mojo/src/mojo/public/mojo.gni") group("ui") { deps = [ diff --git a/mandoline/ui/omnibox/BUILD.gn b/mandoline/ui/omnibox/BUILD.gn index dd81468..3eb272b 100644 --- a/mandoline/ui/omnibox/BUILD.gn +++ b/mandoline/ui/omnibox/BUILD.gn @@ -3,7 +3,6 @@ # found in the LICENSE file. import("//mojo/mojo_application_package.gni") -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") mojo_application_package("omnibox") { sources = [ diff --git a/media/mojo/services/BUILD.gn b/media/mojo/services/BUILD.gn index 338902b..58efa7e 100644 --- a/media/mojo/services/BUILD.gn +++ b/media/mojo/services/BUILD.gn @@ -4,7 +4,7 @@ import("//media/media_options.gni") import("//testing/test.gni") -import("//third_party/mojo/src/mojo/public/mojo_application.gni") +import("//mojo/public/mojo_application.gni") # Target naming conventions: # - converters: C++/Mojo type converters. diff --git a/mojo/application/public/cpp/BUILD.gn b/mojo/application/public/cpp/BUILD.gn index 809abd9..55b9710 100644 --- a/mojo/application/public/cpp/BUILD.gn +++ b/mojo/application/public/cpp/BUILD.gn @@ -2,8 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//third_party/mojo/src/mojo/public/mojo_sdk.gni") - # GYP version: mojo/mojo_base.gyp:mojo_application_base source_set("cpp") { deps = [ diff --git a/mojo/application/public/interfaces/BUILD.gn b/mojo/application/public/interfaces/BUILD.gn index 525bcbf..fe107db 100644 --- a/mojo/application/public/interfaces/BUILD.gn +++ b/mojo/application/public/interfaces/BUILD.gn @@ -2,8 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/module_args/mojo.gni") -import("$mojo_sdk_root/mojo/public/tools/bindings/mojom.gni") import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") # GYP version: mojo/mojo_base.gyp:mojo_application_bindings diff --git a/mojo/gles2/BUILD.gn b/mojo/gles2/BUILD.gn index 83013a1..557b3d8 100644 --- a/mojo/gles2/BUILD.gn +++ b/mojo/gles2/BUILD.gn @@ -2,8 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") - config("mojo_use_gles2") { defines = [ "MOJO_USE_GLES2_IMPL" ] } diff --git a/mojo/mojo_application_package.gni b/mojo/mojo_application_package.gni index f5ace4f..e520856 100644 --- a/mojo/mojo_application_package.gni +++ b/mojo/mojo_application_package.gni @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//third_party/mojo/src/mojo/public/mojo_application.gni") +import("//mojo/public/mojo_application.gni") # Used for mojo applications that have resources. This creates a directory # named output_name with the following contents: diff --git a/mojo/public/mojo.gni b/mojo/public/mojo.gni index f2631a0..7b43cb3 100644 --- a/mojo/public/mojo.gni +++ b/mojo/public/mojo.gni @@ -27,8 +27,15 @@ if (defined(mojo_disable_dart_apptest_framework) && mojo_use_dart_apptest_framework = false } +# Embedder uses Mojo application code. +mojo_use_application_in_sdk = true +if (defined(mojo_disable_application_in_sdk) && + mojo_disable_application_in_sdk) { + mojo_use_application_in_sdk = false +} + # The absolute path to the directory containing the mojo public SDK (i.e., the # directory containing mojo/public). The build files within the Mojo public # SDK use this variable to allow themselves to be parameterized by the location # of the public SDK within a client repo. -mojo_root = get_path_info("../..", "abspath") +mojo_root = get_path_info("../../third_party/mojo/src/", "abspath") diff --git a/mojo/public/mojo_application.gni b/mojo/public/mojo_application.gni index 2c7ee4a..42e03c2 100644 --- a/mojo/public/mojo_application.gni +++ b/mojo/public/mojo_application.gni @@ -2,9 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/module_args/mojo.gni") import("mojo.gni") -import("mojo_sdk.gni") # Generate a binary mojo application.The parameters of this template are those # of a shared library. @@ -295,6 +293,9 @@ if (is_android) { # Variables: # input_so: the .so file to bundle # input_dex_jar: the .dex.jar file to bundle + # deps / public_deps / data_deps (optional): + # Dependencies. The targets that generate the .so/jar inputs should be + # listed in either deps or public_deps. # output_name (optional): override for the output file name template("mojo_android_application") { assert(defined(invoker.input_so)) @@ -302,7 +303,9 @@ if (is_android) { zip_action_name = "${target_name}_zip" zip_action_output = "$target_gen_dir/${target_name}.zip" + prepend_action_name = target_name action(zip_action_name) { + visibility = [ ":$prepend_action_name" ] script = "//build/android/gn/zip.py" inputs = [ @@ -321,6 +324,16 @@ if (is_android) { "--inputs=$rebase_inputs", "--output=$rebase_output", ] + + if (defined(invoker.deps)) { + deps = invoker.deps + } + if (defined(invoker.public_deps)) { + public_deps = invoker.public_deps + } + if (defined(invoker.data_deps)) { + data_deps = invoker.data_deps + } } if (defined(invoker.output_name)) { @@ -349,6 +362,10 @@ if (is_android) { "--output=$rebase_output", "--line=#!mojo mojo:android_handler", ] + + public_deps = [ + ":$zip_action_name", + ] } } } diff --git a/mojo/public/mojo_sdk.gni b/mojo/public/mojo_sdk.gni deleted file mode 100644 index dbed84c..0000000 --- a/mojo/public/mojo_sdk.gni +++ /dev/null @@ -1,139 +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. - -# The absolute path to the directory containing the mojo public SDK (i.e., the -# directory containing mojo/public). The build files within the Mojo public -# SDK use this variable to allow themselves to be parameterized by the location -# of the public SDK within a client repo. -mojo_root = get_path_info("../..", "abspath") - -# Takes as input a "source_set" that includes dependencies that are relative to -# the parent directory of the Mojo public SDK (given in |mojo_sdk_deps|). -# Generates a source_set that has the mojo_sdk_deps added as ordinary deps -# rebased to the current directory. -# By default, restricts the entries that are given in invoker.deps and -# invoker.public_deps to be only within the same file and on a small set of -# whitelisted external dependencies. This check can be elided by setting -# restrict_external_deps to false in the invoker. DO NOT DO THIS in -# //mojo/public. -# -# Example of a mojo_sdk_source_set: -# -# mojo_sdk_source_set("foo") { -# sources = [ -# "foo.h", -# "foo.cc", -# ] -# -# # Same-file deps are specified in the ordinary way. Any external -# dependencies are specified the same way (although in general there should -# be very few of these). -# deps = [ -# ":bar", -# ] -# -# # Mojo SDK deps are specified relative to the containing directory of the -# SDK via mojo_sdk_deps. -# mojo_sdk_deps = [ -# "mojo/public/cpp/bindings", -# "mojo/public/cpp/environment", -# "mojo/public/cpp/system", -# ] -# } -# -template("mojo_sdk_source_set") { - source_set(target_name) { - if (defined(invoker.visibility)) { - visibility = invoker.visibility - } else { - visibility = [ "*" ] - } - if (defined(invoker.mojo_sdk_visibility)) { - foreach(sdk_target, invoker.mojo_sdk_visibility) { - # Check that the SDK target was not mistakenly given as an absolute - # path. - assert(get_path_info(sdk_target, "abspath") != sdk_target) - visibility += [ rebase_path(sdk_target, ".", mojo_root) ] - } - } - - if (defined(invoker.testonly)) { - testonly = invoker.testonly - } - - if (defined(invoker.sources)) { - sources = invoker.sources - } - - if (defined(invoker.defines)) { - defines = invoker.defines - } - - if (defined(invoker.libs)) { - libs = invoker.libs - } - - public_configs = - [ rebase_path("mojo/public/build/config:mojo_sdk", ".", mojo_root) ] - if (defined(invoker.public_configs)) { - public_configs += invoker.public_configs - } - - if (defined(invoker.configs)) { - configs += invoker.configs - } - - if (defined(invoker.allow_circular_includes_from)) { - allow_circular_includes_from = invoker.allow_circular_includes_from - } - - if (defined(invoker.public_deps) || defined(invoker.deps)) { - restrict_external_deps = true - if (defined(invoker.restrict_external_deps)) { - restrict_external_deps = invoker.restrict_external_deps - } - } - - public_deps = [] - if (defined(invoker.public_deps)) { - foreach(dep, invoker.public_deps) { - if (restrict_external_deps) { - # The only deps that are not specified relative to the location of - # the Mojo SDK should be on targets within the same file or on a - # whitelisted set of external dependencies. - assert(get_path_info(dep, "dir") == ".") - } - public_deps += [ dep ] - } - } - if (defined(invoker.mojo_sdk_public_deps)) { - foreach(sdk_dep, invoker.mojo_sdk_public_deps) { - # Check that the SDK dep was not mistakenly given as an absolute path. - assert(get_path_info(sdk_dep, "abspath") != sdk_dep) - public_deps += [ rebase_path(sdk_dep, ".", mojo_root) ] - } - } - - deps = [] - if (defined(invoker.deps)) { - foreach(dep, invoker.deps) { - if (restrict_external_deps) { - # The only deps that are not specified relative to the location of - # the Mojo SDK should be on targets within the same file or on a - # whitelisted set of external dependencies. - dep_dir = get_path_info(dep, "dir") - assert(dep_dir == "." || dep == "//testing/gtest") - } - deps += [ dep ] - } - } - if (defined(invoker.mojo_sdk_deps)) { - foreach(sdk_dep, invoker.mojo_sdk_deps) { - # Check that the SDK dep was not mistakenly given as an absolute path. - assert(get_path_info(sdk_dep, "abspath") != sdk_dep) - deps += [ rebase_path(sdk_dep, ".", mojo_root) ] - } - } - } -} diff --git a/mojo/runner/BUILD.gn b/mojo/runner/BUILD.gn index 6ed8bb1..b390213 100644 --- a/mojo/runner/BUILD.gn +++ b/mojo/runner/BUILD.gn @@ -2,12 +2,10 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/config/ui.gni") import("//mojo/generate_mojo_shell_assets_list.gni") -import("//third_party/mojo/src/mojo/public/mojo.gni") -import("//third_party/mojo/src/mojo/public/mojo_application.gni") -import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") +import("//mojo/public/mojo_application.gni") import("//testing/test.gni") +import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") # We don't support building in the component build since mojo apps are # inherently components. diff --git a/mojo/runner/test/BUILD.gn b/mojo/runner/test/BUILD.gn index e97f462..310dfa9 100644 --- a/mojo/runner/test/BUILD.gn +++ b/mojo/runner/test/BUILD.gn @@ -1,7 +1,9 @@ -import("//third_party/mojo/src/mojo/public/mojo.gni") -import("//third_party/mojo/src/mojo/public/mojo_application.gni") +# Copyright 2015 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. + +import("//mojo/public/mojo_application.gni") import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") -import("//testing/test.gni") mojom("bindings") { sources = [ diff --git a/mojo/services/network/BUILD.gn b/mojo/services/network/BUILD.gn index 6642b7ef..02ef3f0 100644 --- a/mojo/services/network/BUILD.gn +++ b/mojo/services/network/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//third_party/mojo/src/mojo/public/mojo_application.gni") +import("//mojo/public/mojo_application.gni") if (is_android) { import("//build/config/android/rules.gni") diff --git a/mojo/services/network/public/cpp/BUILD.gn b/mojo/services/network/public/cpp/BUILD.gn index 75be8c5..52af16b 100644 --- a/mojo/services/network/public/cpp/BUILD.gn +++ b/mojo/services/network/public/cpp/BUILD.gn @@ -2,7 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/module_args/mojo.gni") import("//third_party/mojo/src/mojo/public/mojo_sdk.gni") mojo_sdk_source_set("cpp") { diff --git a/mojo/services/network/public/interfaces/BUILD.gn b/mojo/services/network/public/interfaces/BUILD.gn index e72ff78..b39bb2d 100644 --- a/mojo/services/network/public/interfaces/BUILD.gn +++ b/mojo/services/network/public/interfaces/BUILD.gn @@ -2,7 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/module_args/mojo.gni") import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") mojom("interfaces") { diff --git a/mojo/services/test_service/BUILD.gn b/mojo/services/test_service/BUILD.gn index 150796c..90bf19a 100644 --- a/mojo/services/test_service/BUILD.gn +++ b/mojo/services/test_service/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//third_party/mojo/src/mojo/public/mojo_application.gni") +import("//mojo/public/mojo_application.gni") import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") group("test_service") { diff --git a/mojo/services/tracing/BUILD.gn b/mojo/services/tracing/BUILD.gn index b6406f3..c618f37 100644 --- a/mojo/services/tracing/BUILD.gn +++ b/mojo/services/tracing/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//third_party/mojo/src/mojo/public/mojo_application.gni") +import("//mojo/public/mojo_application.gni") import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") mojo_native_application("tracing") { diff --git a/ui/mojo/events/BUILD.gn b/ui/mojo/events/BUILD.gn index 679509c..1652936 100644 --- a/ui/mojo/events/BUILD.gn +++ b/ui/mojo/events/BUILD.gn @@ -2,7 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/module_args/mojo.gni") import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") mojom("interfaces") { |