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

Side by Side Diff: build/module_args/mojo.gni

Issue 1157573002: Revert "Update mojo sdk to rev 1dc8a9a5db73d3718d99917fadf31f5fb2ebad4f" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 unified diff | Download patch
« no previous file with comments | « no previous file | components/filesystem/directory_impl_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # This variable should point to the parent directory of the Mojo SDK. 5 # This variable should point to the parent directory of the Mojo SDK.
6 mojo_sdk_root = "//third_party/mojo/src" 6 mojo_sdk_root = "//third_party/mojo/src"
7 7
8 # Chromium builds the network service from source, as it is the 8 # Chromium builds the network service from source, as it is the
9 # producer of the network service. 9 # producer of the network service.
10 mojo_build_network_service_from_source = true 10 mojo_build_network_service_from_source = true
11 11
12 # Chromium does not build dart apptests. Disable any Mojo targets which 12 # Chromium does not build dart apptests. Disable any Mojo targets which
13 # depend on the apptest framework. 13 # depend on the apptest framework.
14 mojo_disable_dart_apptest_framework = true 14 mojo_disable_dart_apptest_framework = true
15 15
16 # Points to the directory network_service is built from. 16 # Points to the directory network_service is built from.
17 mojo_network_service_root = "//mojo/services" 17 mojo_network_service_root = "//mojo/services"
18 18
19 # We use our own custom application code. Don't build Mojo's.
20 mojo_disable_application_in_sdk = true
21
22 declare_args() { 19 declare_args() {
23 # The mojo shell is forked and built in the chromium repo. 20 # The mojo shell is forked and built in the chromium repo.
24 mojo_build_mojo_shell_from_source = true 21 mojo_build_mojo_shell_from_source = true
25 22
26 # Specify prebuilt network service mojo file location rather than download 23 # Specify prebuilt network service mojo file location rather than download
27 # from gs://mojo. 24 # from gs://mojo.
28 # 25 #
29 # This variable only used when mojo_build_network_service_from_source is 26 # This variable only used when mojo_build_network_service_from_source is
30 # false. 27 # false.
31 # 28 #
32 # Currently only android_arm and linux_64 available on gs://mojo, and no plan 29 # Currently only android_arm and linux_64 available on gs://mojo, and no plan
33 # to support more(https://codereview.chromium.org/921873003). 30 # to support more(https://codereview.chromium.org/921873003).
34 # It is needed for developers works on other platforms like android_x86 and 31 # It is needed for developers works on other platforms like android_x86 and
35 # android_x64. And it is also useful for supportted platform as well when 32 # android_x64. And it is also useful for supportted platform as well when
36 # developer want to try its own version of network service files. 33 # developer want to try its own version of network service files.
37 mojo_prebuilt_network_service_location = "" 34 mojo_prebuilt_network_service_location = ""
38 35
39 # For network_service_apptests.mojo 36 # For network_service_apptests.mojo
40 mojo_prebuilt_network_service_apptests_location = "" 37 mojo_prebuilt_network_service_apptests_location = ""
41 } 38 }
OLDNEW
« no previous file with comments | « no previous file | components/filesystem/directory_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698