| Index: mojo/public/mojo.gni
|
| diff --git a/mojo/public/mojo.gni b/mojo/public/mojo.gni
|
| index 7b43cb33a39b1e130a122e0340ff097bf5fba249..d7bf744098e954c4669fe96b33cd627c11debdbe 100644
|
| --- a/mojo/public/mojo.gni
|
| +++ b/mojo/public/mojo.gni
|
| @@ -2,40 +2,13 @@
|
| # Use of this source code is governed by a BSD-style license that can be
|
| # found in the LICENSE file.
|
|
|
| -import("//build/module_args/mojo.gni")
|
| +# TODO(dpranke): Remove all of these variables.
|
|
|
| -# If using the prebuilt shell, gate its usage by the platforms for which it is
|
| -# published.
|
| +mojo_sdk_root = "//third_party/mojo/src"
|
| +mojo_network_service_root = "//mojo/services"
|
| mojo_use_prebuilt_mojo_shell = false
|
| -if (!defined(mojo_build_mojo_shell_from_source) ||
|
| - !mojo_build_mojo_shell_from_source) {
|
| - mojo_use_prebuilt_mojo_shell = is_linux || is_android
|
| -}
|
| -
|
| -# If using the prebuilt network service, gate its usage by the platforms for
|
| -# which it is published.
|
| mojo_use_prebuilt_network_service = false
|
| -if (!defined(mojo_build_network_service_from_source) ||
|
| - !mojo_build_network_service_from_source) {
|
| - mojo_use_prebuilt_network_service = is_linux || is_android
|
| -}
|
| -
|
| -# Enable Dart apptest framework by default.
|
| -mojo_use_dart_apptest_framework = true
|
| -if (defined(mojo_disable_dart_apptest_framework) &&
|
| - mojo_disable_dart_apptest_framework) {
|
| - 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
|
| -}
|
| -
|
| -# The absolute path to the directory containing the mojo public SDK (i.e., the
|
| -# directory containing mojo/public). The build files within the Mojo public
|
| -# SDK use this variable to allow themselves to be parameterized by the location
|
| -# of the public SDK within a client repo.
|
| +mojo_use_dart_apptest_framework = false
|
| +mojo_use_application_in_sdk = false
|
| +mojo_use_network_in_sdk = false
|
| mojo_root = get_path_info("../../third_party/mojo/src/", "abspath")
|
|
|