From e5b6ffe4098f8f6f055397302022b6a03d698acb Mon Sep 17 00:00:00 2001
From: sky <sky@chromium.org>
Date: Wed, 9 Mar 2016 21:45:27 -0800
Subject: Moves mojo_application_manifest to data_deps

Otherwise they aren't picked up as runtime dependencies and isolates
won't work.

BUG=none
TEST=none
R=ben@chromium.org

Review URL: https://codereview.chromium.org/1783533003

Cr-Commit-Position: refs/heads/master@{#380347}
---
 mojo/shell/BUILD.gn                  |  5 ++++-
 mojo/shell/background/tests/BUILD.gn |  1 -
 mojo/shell/runner/child/BUILD.gn     |  2 +-
 mojo/shell/tests/BUILD.gn            |  1 -
 mojo/shell/tests/connect/BUILD.gn    |  2 +-
 mojo/shell/tests/lifecycle/BUILD.gn  | 12 +++++++++---
 mojo/shell/tests/shell/BUILD.gn      | 12 +++++++++---
 7 files changed, 24 insertions(+), 11 deletions(-)

(limited to 'mojo/shell')

diff --git a/mojo/shell/BUILD.gn b/mojo/shell/BUILD.gn
index 36e0b45..2f7be9d 100644
--- a/mojo/shell/BUILD.gn
+++ b/mojo/shell/BUILD.gn
@@ -34,7 +34,6 @@ source_set("shell") {
   ]
 
   deps = [
-    ":manifest",
     "//base",
     "//base/third_party/dynamic_annotations",
     "//mojo/common",
@@ -51,6 +50,10 @@ source_set("shell") {
     "//mojo/services/catalog:lib",
   ]
 
+  data_deps = [
+    ":manifest",
+  ]
+
   # For mojo/shell/application_loader.h
   allow_circular_includes_from = [ "//mojo/services/catalog:lib" ]
 }
diff --git a/mojo/shell/background/tests/BUILD.gn b/mojo/shell/background/tests/BUILD.gn
index d3b8b19..59b3482 100644
--- a/mojo/shell/background/tests/BUILD.gn
+++ b/mojo/shell/background/tests/BUILD.gn
@@ -3,7 +3,6 @@
 # found in the LICENSE file.
 
 import("//mojo/public/mojo_application.gni")
-import("//mojo/public/mojo_application_manifest.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 import("//testing/test.gni")
 
diff --git a/mojo/shell/runner/child/BUILD.gn b/mojo/shell/runner/child/BUILD.gn
index a534dff..6730d94 100644
--- a/mojo/shell/runner/child/BUILD.gn
+++ b/mojo/shell/runner/child/BUILD.gn
@@ -72,7 +72,6 @@ mojo_native_application("apptests") {
 
   deps = [
     ":apptest_interfaces",
-    ":manifest",
     "//base",
     "//base/test:test_config",
     "//mojo/shell/public/cpp:sources",
@@ -80,6 +79,7 @@ mojo_native_application("apptests") {
   ]
 
   data_deps = [
+    ":manifest",
     ":native_target",
   ]
 }
diff --git a/mojo/shell/tests/BUILD.gn b/mojo/shell/tests/BUILD.gn
index 91c2970..d044db42 100644
--- a/mojo/shell/tests/BUILD.gn
+++ b/mojo/shell/tests/BUILD.gn
@@ -3,7 +3,6 @@
 # found in the LICENSE file.
 
 import("//mojo/public/mojo_application.gni")
-import("//mojo/public/mojo_application_manifest.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 import("//testing/test.gni")
 
diff --git a/mojo/shell/tests/connect/BUILD.gn b/mojo/shell/tests/connect/BUILD.gn
index d94fd9a..d2818b2 100644
--- a/mojo/shell/tests/connect/BUILD.gn
+++ b/mojo/shell/tests/connect/BUILD.gn
@@ -14,7 +14,6 @@ source_set("connect") {
   ]
   deps = [
     ":interfaces",
-    ":manifest",
     "//base",
     "//base/test:test_support",
     "//mojo/shell/public/cpp:shell_test_support",
@@ -25,6 +24,7 @@ source_set("connect") {
   data_deps = [
     ":connect_test_app",
     ":connect_test_package",
+    ":manifest",
   ]
 }
 
diff --git a/mojo/shell/tests/lifecycle/BUILD.gn b/mojo/shell/tests/lifecycle/BUILD.gn
index 302ba98..7575356 100644
--- a/mojo/shell/tests/lifecycle/BUILD.gn
+++ b/mojo/shell/tests/lifecycle/BUILD.gn
@@ -14,7 +14,6 @@ source_set("lifecycle") {
   ]
   deps = [
     ":interfaces",
-    ":manifest",
     "//base",
     "//base/test:test_support",
     "//mojo/edk/system",
@@ -28,6 +27,7 @@ source_set("lifecycle") {
     ":lifecycle_unittest_app",
     ":lifecycle_unittest_exe",
     ":lifecycle_unittest_package",
+    ":manifest",
   ]
 }
 
@@ -101,10 +101,13 @@ mojo_native_application("lifecycle_unittest_app") {
   deps = [
     ":app_client",
     ":interfaces",
-    ":lifecycle_unittest_app_manifest",
     "//base",
     "//mojo/shell/public/cpp:sources",
   ]
+
+  data_deps = [
+    ":lifecycle_unittest_app_manifest",
+  ]
 }
 
 mojo_application_manifest("lifecycle_unittest_app_manifest") {
@@ -119,11 +122,14 @@ executable("lifecycle_unittest_exe") {
   ]
   deps = [
     ":app_client",
-    ":lifecycle_unittest_exe_manifest",
     "//base",
     "//mojo/shell/public/cpp:sources",
     "//mojo/shell/runner/child:test_native_main",
   ]
+
+  data_deps = [
+    ":lifecycle_unittest_exe_manifest",
+  ]
 }
 
 mojo_application_manifest("lifecycle_unittest_exe_manifest") {
diff --git a/mojo/shell/tests/shell/BUILD.gn b/mojo/shell/tests/shell/BUILD.gn
index fc2c25a..c1b2379 100644
--- a/mojo/shell/tests/shell/BUILD.gn
+++ b/mojo/shell/tests/shell/BUILD.gn
@@ -15,7 +15,6 @@ source_set("shell") {
 
   deps = [
     ":interfaces",
-    ":manifest",
     "//base",
     "//base/test:test_config",
     "//mojo/common:common_base",
@@ -25,6 +24,7 @@ source_set("shell") {
   ]
 
   data_deps = [
+    ":manifest",
     ":shell_unittest_driver",
     ":shell_unittest_target",
   ]
@@ -49,7 +49,6 @@ executable("shell_unittest_driver") {
   ]
 
   deps = [
-    ":driver_manifest",
     ":interfaces",
     "//base",
     "//mojo/edk/system",
@@ -59,6 +58,10 @@ executable("shell_unittest_driver") {
     "//mojo/shell/runner/child:test_native_main",
     "//mojo/shell/runner/common",
   ]
+
+  data_deps = [
+    ":driver_manifest",
+  ]
 }
 
 mojo_application_manifest("driver_manifest") {
@@ -76,11 +79,14 @@ executable("shell_unittest_target") {
 
   deps = [
     ":interfaces",
-    ":target_manifest",
     "//base",
     "//mojo/shell/public/cpp",
     "//mojo/shell/runner/child:test_native_main",
   ]
+
+  data_deps = [
+    ":target_manifest",
+  ]
 }
 
 mojo_application_manifest("target_manifest") {
-- 
cgit v1.1