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

Unified Diff: mojo/public/BUILD.gn

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 years, 1 month 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 | « mojo/platform_handle/platform_handle_functions.h ('k') | mojo/public/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/public/BUILD.gn
diff --git a/third_party/mojo/src/mojo/public/BUILD.gn b/mojo/public/BUILD.gn
similarity index 64%
rename from third_party/mojo/src/mojo/public/BUILD.gn
rename to mojo/public/BUILD.gn
index df936d54d87a35b88bd6105b1356933b20c0f56e..d7bb448beee889e9962a4168615639a122037d3b 100644
--- a/third_party/mojo/src/mojo/public/BUILD.gn
+++ b/mojo/public/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("//mojo/public/mojo.gni")
-
group("public") {
# Meta-target, don't link into production code.
testonly = true
@@ -16,20 +14,12 @@ group("public") {
"interfaces/bindings/tests:test_interfaces",
]
- if (mojo_use_application_in_sdk) {
- deps += [ "cpp/application:standalone" ]
- }
-
if (is_android) {
deps += [
"java:system",
"java:bindings",
]
}
-
- if (is_android && mojo_use_application_in_sdk) {
- deps += [ "java:application" ]
- }
}
group("sdk") {
@@ -41,17 +31,6 @@ group("sdk") {
"interfaces/bindings",
"js",
]
-
- if (mojo_use_application_in_sdk) {
- deps += [
- "cpp/application:standalone",
- "interfaces/application",
- ]
- }
-
- if (mojo_use_network_in_sdk) {
- deps += [ "interfaces/network" ]
- }
}
static_library("libmojo_sdk") {
« no previous file with comments | « mojo/platform_handle/platform_handle_functions.h ('k') | mojo/public/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698