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

Unified Diff: mojo/public/tools/BUILD.gn

Issue 1034603002: Prefix build variables used in separate repos with mojo_ (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: more mojo_ Created 5 years, 9 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/public/mojo_application.gni ('k') | mojo/services/content_handler/public/interfaces/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/public/tools/BUILD.gn
diff --git a/mojo/public/tools/BUILD.gn b/mojo/public/tools/BUILD.gn
index b5cfcd49f6f1a1ff5d59af6c43586ca7f259c4f9..9344cf31027420146cee303312892347276493fd 100644
--- a/mojo/public/tools/BUILD.gn
+++ b/mojo/public/tools/BUILD.gn
@@ -5,7 +5,7 @@
import("//build/module_args/mojo.gni")
import("../mojo.gni")
-if (use_prebuilt_mojo_shell) {
+if (mojo_use_prebuilt_mojo_shell) {
copy("copy_mojo_shell") {
filename = "mojo_shell"
if (is_android) {
@@ -28,13 +28,13 @@ if (use_prebuilt_mojo_shell) {
}
}
-if (use_prebuilt_network_service) {
+if (mojo_use_prebuilt_network_service) {
copy("copy_network_service") {
filename = "network_service.mojo"
- if (defined(prebuilt_network_service_location) &&
- prebuilt_network_service_location != "") {
+ if (defined(mojo_prebuilt_network_service_location) &&
+ mojo_prebuilt_network_service_location != "") {
sources = [
- "$prebuilt_network_service_location",
+ "$mojo_prebuilt_network_service_location",
]
} else {
if (is_android) {
@@ -78,7 +78,7 @@ if (use_prebuilt_network_service) {
# loaded from Google Storage and then puts it in a rule which the
# "dart_package" template in mojo/public/dart/rules.gni can introspect on,
# accessing the 'label' and 'target_out_dir' variables.
-if (use_dart_apptest_framework) {
+if (mojo_use_dart_apptest_framework) {
copy("dart_apptest_framework") {
sources = [
"prebuilt/frameworks/apptest.dartzip",
« no previous file with comments | « mojo/public/mojo_application.gni ('k') | mojo/services/content_handler/public/interfaces/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698