Remove the mojo_use_application_in_sdk GN variable. This basically reverts 074bd7376cfa07f424054f196f975c548c88d286. R=jamesr@chromium.org Review URL: https://codereview.chromium.org/1429653004 .
diff --git a/mojo/edk/test/BUILD.gn b/mojo/edk/test/BUILD.gn index a52fb1c..ca96992 100644 --- a/mojo/edk/test/BUILD.gn +++ b/mojo/edk/test/BUILD.gn
@@ -3,7 +3,6 @@ # found in the LICENSE file. import("../mojo_edk.gni") -import("../../public/mojo.gni") import("//testing/test.gni") mojo_edk_source_set("test_support") { @@ -97,6 +96,7 @@ group("public_tests") { testonly = true deps = [ + ":mojo_public_application_unittests", ":mojo_public_bindings_perftests", ":mojo_public_bindings_unittests", ":mojo_public_environment_unittests", @@ -105,19 +105,13 @@ ":mojo_public_utility_unittests", ":mojo_system_impl_private_unittests", ] - - if (mojo_use_application_in_sdk) { - deps += [ ":mojo_public_application_unittests" ] - } } -if (mojo_use_application_in_sdk) { - test("mojo_public_application_unittests") { - deps = [ - ":run_all_unittests", - "../../public/cpp/application/tests", - ] - } +test("mojo_public_application_unittests") { + deps = [ + ":run_all_unittests", + "../../public/cpp/application/tests", + ] } test("mojo_public_bindings_unittests") {
diff --git a/mojo/public/BUILD.gn b/mojo/public/BUILD.gn index c712953..2d256e7 100644 --- a/mojo/public/BUILD.gn +++ b/mojo/public/BUILD.gn
@@ -10,16 +10,13 @@ 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 @@ 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" ] }
diff --git a/mojo/public/cpp/bindings/tests/BUILD.gn b/mojo/public/cpp/bindings/tests/BUILD.gn index e04a655..20164b3 100644 --- a/mojo/public/cpp/bindings/tests/BUILD.gn +++ b/mojo/public/cpp/bindings/tests/BUILD.gn
@@ -4,7 +4,6 @@ import("../../../mojo_application.gni") import("../../../mojo_sdk.gni") -import("../../../mojo.gni") mojo_sdk_source_set("tests") { testonly = true @@ -87,56 +86,54 @@ mojo_sdk_deps = [ "mojo/public/c/system" ] } -if (mojo_use_application_in_sdk) { - mojo_native_application("versioning_test_service") { - testonly = true +mojo_native_application("versioning_test_service") { + testonly = true - deps = [ - ":versioning_test_service_source_set", - ] - } + deps = [ + ":versioning_test_service_source_set", + ] +} - mojo_sdk_source_set("versioning_test_service_source_set") { - testonly = true - visibility = [ ":*" ] +mojo_sdk_source_set("versioning_test_service_source_set") { + testonly = true + visibility = [ ":*" ] - sources = [ - "versioning_test_service.cc", - ] + sources = [ + "versioning_test_service.cc", + ] - mojo_sdk_deps = [ - "mojo/public/cpp/application:standalone", - "mojo/public/cpp/bindings", - "mojo/public/cpp/system", - "mojo/public/interfaces/bindings/tests:versioning_test_service_interfaces", - ] - } + mojo_sdk_deps = [ + "mojo/public/cpp/application:standalone", + "mojo/public/cpp/bindings", + "mojo/public/cpp/system", + "mojo/public/interfaces/bindings/tests:versioning_test_service_interfaces", + ] +} - mojo_native_application("versioning_apptests") { - testonly = true +mojo_native_application("versioning_apptests") { + testonly = true - deps = [ - ":versioning_apptest_source_set", - ] - data_deps = [ - ":versioning_test_service", - ] - } + deps = [ + ":versioning_apptest_source_set", + ] + data_deps = [ + ":versioning_test_service", + ] +} - mojo_sdk_source_set("versioning_apptest_source_set") { - testonly = true - visibility = [ ":*" ] +mojo_sdk_source_set("versioning_apptest_source_set") { + testonly = true + visibility = [ ":*" ] - sources = [ - "versioning_apptest.cc", - ] + sources = [ + "versioning_apptest.cc", + ] - mojo_sdk_deps = [ - "mojo/public/cpp/application:standalone", - "mojo/public/cpp/application:test_support_standalone", - "mojo/public/cpp/bindings", - "mojo/public/cpp/system", - "mojo/public/interfaces/bindings/tests:versioning_test_client_interfaces", - ] - } + mojo_sdk_deps = [ + "mojo/public/cpp/application:standalone", + "mojo/public/cpp/application:test_support_standalone", + "mojo/public/cpp/bindings", + "mojo/public/cpp/system", + "mojo/public/interfaces/bindings/tests:versioning_test_client_interfaces", + ] }
diff --git a/mojo/public/java/BUILD.gn b/mojo/public/java/BUILD.gn index 6c9c308..81c3ba1 100644 --- a/mojo/public/java/BUILD.gn +++ b/mojo/public/java/BUILD.gn
@@ -3,7 +3,6 @@ # found in the LICENSE file. import("//build/config/android/rules.gni") -import("../mojo.gni") android_library("system") { java_files = [ @@ -24,6 +23,22 @@ ] } +android_library("application") { + java_files = [ + "application/src/org/chromium/mojo/application/ApplicationConnection.java", + "application/src/org/chromium/mojo/application/ApplicationDelegate.java", + "application/src/org/chromium/mojo/application/ApplicationImpl.java", + "application/src/org/chromium/mojo/application/ApplicationRunner.java", + "application/src/org/chromium/mojo/application/ServiceFactoryBinder.java", + "application/src/org/chromium/mojo/application/ShellHelper.java", + ] + deps = [ + ":bindings", + ":system", + "../interfaces/application:application_java", + ] +} + android_library("bindings") { java_files = [ "bindings/src/org/chromium/mojo/bindings/AutoCloseableRouter.java", @@ -60,21 +75,3 @@ srcjar_deps = [ "../interfaces/bindings:bindings_java_sources" ] } - -if (mojo_use_application_in_sdk) { - android_library("application") { - java_files = [ - "application/src/org/chromium/mojo/application/ApplicationConnection.java", - "application/src/org/chromium/mojo/application/ApplicationDelegate.java", - "application/src/org/chromium/mojo/application/ApplicationImpl.java", - "application/src/org/chromium/mojo/application/ApplicationRunner.java", - "application/src/org/chromium/mojo/application/ServiceFactoryBinder.java", - "application/src/org/chromium/mojo/application/ShellHelper.java", - ] - deps = [ - ":bindings", - ":system", - "../interfaces/application:application_java", - ] - } -}
diff --git a/mojo/public/mojo.gni b/mojo/public/mojo.gni index bb06cdb..cadb3d6 100644 --- a/mojo/public/mojo.gni +++ b/mojo/public/mojo.gni
@@ -38,13 +38,6 @@ mojo_use_dart_apptest_framework = false } -# Embedder uses Mojo application code. -mojo_use_application_in_sdk = true -if (defined(mojo_disable_application_in_sdk) && - mojo_disable_application_in_sdk) { - mojo_use_application_in_sdk = false -} - # Embedder uses Mojo network interfaces. mojo_use_network_in_sdk = true if (defined(mojo_disable_network_in_sdk) && mojo_disable_network_in_sdk) {