diff options
author | Dan Willemsen <dwillemsen@google.com> | 2018-09-28 17:39:22 -0700 |
---|---|---|
committer | Dan Willemsen <dwillemsen@google.com> | 2018-09-29 00:42:38 +0000 |
commit | bb306940b75976fb2563fa74386102599f325df4 (patch) | |
tree | 0468ab26727adacf622415705c10999a86a495cd | |
parent | d9bf6268de2df092444907c6e2fb76655f6d27b4 (diff) | |
parent | 7d2255db4ec4ecca7ec73b02aaa7a7aa7b16d537 (diff) | |
download | kati-bb306940b75976fb2563fa74386102599f325df4.tar.gz |
Merge remote-tracking branch 'aosp/upstream' into masterandroid-o-mr1-iot-release-1.0.5
* aosp/upstream:
Add --no_ninja_prelude
Test: prebuilts/build-tools/build-prebuilts.sh
Change-Id: Ic6757068b404ab0002b206c7efa516e2e7e99023
-rw-r--r-- | flags.cc | 2 | ||||
-rw-r--r-- | flags.h | 1 | ||||
-rw-r--r-- | ninja.cc | 14 |
3 files changed, 11 insertions, 6 deletions
@@ -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")) { @@ -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; @@ -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); |