diff options
Diffstat (limited to 'mojo')
| -rw-r--r-- | mojo/BUILD.gn | 9 | ||||
| -rw-r--r-- | mojo/mojo_application_package.gni | 19 | ||||
| -rw-r--r-- | mojo/services/BUILD.gn | 3 | ||||
| -rw-r--r-- | mojo/tools/data/apptests | 3 |
4 files changed, 8 insertions, 26 deletions
diff --git a/mojo/BUILD.gn b/mojo/BUILD.gn index c040306..c89d084 100644 --- a/mojo/BUILD.gn +++ b/mojo/BUILD.gn @@ -38,13 +38,4 @@ group("tests") { "//third_party/mojo/src/mojo/edk/test:mojo_public_system_unittests", "//third_party/mojo/src/mojo/edk/test:mojo_public_utility_unittests", ] - - # TODO: get these working on android. - if (!is_android && !is_component_build) { - deps += [ - "//mojo/runner:apptests", - "//mojo/runner:mojo_runner_unittests", - "//mojo/shell:mojo_shell_unittests", - ] - } } diff --git a/mojo/mojo_application_package.gni b/mojo/mojo_application_package.gni index 233ee97..9e6c1fd 100644 --- a/mojo/mojo_application_package.gni +++ b/mojo/mojo_application_package.gni @@ -9,17 +9,18 @@ import("//third_party/mojo/src/mojo/public/mojo_application.gni") # output_name.mojo : the shared library # resources : resources template("mojo_application_package") { + if (defined(invoker.output_name)) { + output_name = invoker.output_name + } else { + output_name = target_name + } + mojo_deps = [] if (defined(invoker.deps)) { mojo_deps += invoker.deps } if (defined(invoker.resources)) { - output_name = target_name - if (defined(invoker.output_name)) { - output_name = invoker.output_name - } - copy("copy_mojo_application_resources") { sources = invoker.resources outputs = [ @@ -29,12 +30,8 @@ template("mojo_application_package") { mojo_deps += [ ":copy_mojo_application_resources" ] } - mojo_native_application(target_name) { - output_name = invoker.target_name - if (defined(invoker.output_name)) { - output_name = invoker.output_name - } - output_name = output_name + "/" + output_name + mojo_native_application(output_name) { + output_name = invoker.target_name + "/" + invoker.target_name deps = mojo_deps diff --git a/mojo/services/BUILD.gn b/mojo/services/BUILD.gn index cc7c0a6..652d418 100644 --- a/mojo/services/BUILD.gn +++ b/mojo/services/BUILD.gn @@ -23,7 +23,6 @@ group("services") { "//components/html_viewer", "//components/kiosk_wm:window_manager", "//components/native_viewport", - "//components/resource_provider", "//components/surfaces", "//components/view_manager", "//components/window_manager:lib", @@ -52,7 +51,6 @@ group("tests") { if (!is_component_build) { deps += [ "//components/html_viewer:html_viewer_unittests", - "//components/resource_provider:tests", "//components/view_manager:view_manager_service_unittests", ] @@ -75,7 +73,6 @@ group("apptests") { deps += [ "//components/clipboard:apptests", "//components/html_viewer:apptests", - "//components/resource_provider:apptests", "//components/view_manager:apptests", "//components/window_manager:apptests", "//mojo/services/network:apptests", diff --git a/mojo/tools/data/apptests b/mojo/tools/data/apptests index 2c892f4..f023d70 100644 --- a/mojo/tools/data/apptests +++ b/mojo/tools/data/apptests @@ -51,7 +51,4 @@ tests = [ "test": "mojo:window_manager_apptests", "shell-args": ["--use-headless-config"] }, - { - "test": "mojo:resource_provider_apptests", - }, ] |