Merge remote-tracking branch 'aosp/upstream' into master

am: bb306940b7

Change-Id: Ic8911075c8846753f5c3d54c259d0bb56c74babd

3 files changed, 11 insertions, 6 deletions

diff --git a/flags.cc b/flags.cc
index df64a45..07b5748 100644
--- a/flags.cc
+++ b/flags.cc
@@ -102,6 +102,8 @@ void Flags::Parse(int argc, char** argv) {
       color_warnings = true;
     } else if (!strcmp(arg, "--no_builtin_rules")) {
       no_builtin_rules = true;
+    } else if (!strcmp(arg, "--no_ninja_prelude")) {
+      no_ninja_prelude = true;
     } else if (!strcmp(arg, "--werror_find_emulator")) {
       werror_find_emulator = true;
     } else if (!strcmp(arg, "--werror_overriding_commands")) {
diff --git a/flags.h b/flags.h
index ce32ee8..025979a 100644
--- a/flags.h
+++ b/flags.h
@@ -41,6 +41,7 @@ struct Flags {
   bool use_find_emulator;
   bool color_warnings;
   bool no_builtin_rules;
+  bool no_ninja_prelude;
   bool werror_find_emulator;
   bool werror_overriding_commands;
   bool warn_implicit_rules;
diff --git a/ninja.cc b/ninja.cc
index 495f2f1..fb42444 100644
--- a/ninja.cc
+++ b/ninja.cc
@@ -600,14 +600,16 @@ class NinjaGenerator {
       fprintf(fp_, "\n");
     }
 
-    if (g_flags.ninja_dir) {
-      fprintf(fp_, "builddir = %s\n\n", g_flags.ninja_dir);
-    }
+    if (!g_flags.no_ninja_prelude) {
+      if (g_flags.ninja_dir) {
+        fprintf(fp_, "builddir = %s\n\n", g_flags.ninja_dir);
+      }
 
-    fprintf(fp_, "pool local_pool\n");
-    fprintf(fp_, " depth = %d\n\n", g_flags.num_jobs);
+      fprintf(fp_, "pool local_pool\n");
+      fprintf(fp_, " depth = %d\n\n", g_flags.num_jobs);
 
-    fprintf(fp_, "build _kati_always_build_: phony\n\n");
+      fprintf(fp_, "build _kati_always_build_: phony\n\n");
+    }
 
     unique_ptr<ThreadPool> tp(NewThreadPool(g_flags.num_jobs));
     CHECK(g_flags.num_jobs);