summaryrefslogtreecommitdiffstats
path: root/components/resource_provider
diff options
context:
space:
mode:
authormsw <msw@chromium.org>2015-06-15 14:10:19 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-15 21:10:50 +0000
commite6439a2c956a2f09f40f10e8394a53437ad269ed (patch)
tree785ea16e0ba1ecbd928400b5c4192b3814977027 /components/resource_provider
parent6a0f7841dfdb679bbfa8711fcb1827bcc3d9c849 (diff)
downloadchromium_src-e6439a2c956a2f09f40f10e8394a53437ad269ed.zip
chromium_src-e6439a2c956a2f09f40f10e8394a53437ad269ed.tar.gz
chromium_src-e6439a2c956a2f09f40f10e8394a53437ad269ed.tar.bz2
Build Mojo apps in subdirectories, like application packages.
Build all <foo>.mojo targets in a <foo> sub-directory. Support resources bundled in mojo_native_application. Remove mojo_application_package (now redundant). Update hard-coded paths and simplify URL resolution code. Remove apps bundled in core_services from Mandoline.apk (network service, surfaces service, view manager) This would help NetworkFetcher resolve app locations. (Android apptests host the build dir on a local server) (but apptests should instead bundle apps in an apk) BUG=498020 TEST=Mojo runner and Mandoline still work (as much as they currently do :-/) R=scottmg@chromium.org,sky@chromium.org Review URL: https://codereview.chromium.org/1180653002 Cr-Commit-Position: refs/heads/master@{#334455}
Diffstat (limited to 'components/resource_provider')
-rw-r--r--components/resource_provider/BUILD.gn3
1 files changed, 1 insertions, 2 deletions
diff --git a/components/resource_provider/BUILD.gn b/components/resource_provider/BUILD.gn
index aea501a..b495aa7 100644
--- a/components/resource_provider/BUILD.gn
+++ b/components/resource_provider/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("//mojo/mojo_application_package.gni")
import("//mojo/public/mojo_application.gni")
import("//testing/test.gni")
@@ -113,7 +112,7 @@ test("tests") {
]
}
-mojo_application_package("apptests") {
+mojo_native_application("apptests") {
output_name = "resource_provider_apptests"
testonly = true