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

Unified Diff: mojo/public/BUILD.gn

Issue 1429653004: Remove the mojo_use_application_in_sdk GN variable. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 2 months 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/edk/test/BUILD.gn ('k') | mojo/public/cpp/bindings/tests/BUILD.gn » ('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/mojo/public/BUILD.gn b/mojo/public/BUILD.gn
index c7129539c77fbe711354826895b0c11265eac921..2d256e7d8994dab255d29e6f19af949d92ec3fc7 100644
--- a/mojo/public/BUILD.gn
+++ b/mojo/public/BUILD.gn
@@ -10,16 +10,13 @@ group("public") {
deps = [
":libmojo_sdk",
":sdk",
+ "cpp/application:standalone",
"cpp/bindings",
"cpp/environment:standalone",
"cpp/utility",
"interfaces/bindings/tests:test_interfaces",
]
- if (mojo_use_application_in_sdk) {
- deps += [ "cpp/application:standalone" ]
- }
-
if (is_linux && !is_fnl) {
deps += [
"python",
@@ -29,33 +26,25 @@ group("public") {
if (is_android) {
deps += [
+ "java:application",
"java:system",
"java:bindings",
]
}
-
- if (is_android && mojo_use_application_in_sdk) {
- deps += [ "java:application" ]
- }
}
group("sdk") {
deps = [
"c/system",
+ "cpp/application:standalone",
"cpp/bindings",
"cpp/environment:standalone",
"cpp/utility",
+ "interfaces/application",
"interfaces/bindings",
"js",
]
- if (mojo_use_application_in_sdk) {
- deps += [
- "cpp/application:standalone",
- "interfaces/application",
- ]
- }
-
if (mojo_use_network_in_sdk) {
deps += [ "interfaces/network" ]
}
« no previous file with comments | « mojo/edk/test/BUILD.gn ('k') | mojo/public/cpp/bindings/tests/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698