diff options
author | Shinichiro Hamaji <shinichiro.hamaji@gmail.com> | 2016-02-19 13:45:29 +0900 |
---|---|---|
committer | Shinichiro Hamaji <shinichiro.hamaji@gmail.com> | 2016-02-19 13:45:29 +0900 |
commit | 94dc4c7127f776967c1276544571be7d19d7efa2 (patch) | |
tree | 06cc3d94fdf8941b2ac263f6ad40d7a340eb0ac4 | |
parent | 422179d6ddbf649a04ca44c24fe1f4ba456e4769 (diff) | |
download | android_build_kati-94dc4c7127f776967c1276544571be7d19d7efa2.tar.gz android_build_kati-94dc4c7127f776967c1276544571be7d19d7efa2.tar.bz2 android_build_kati-94dc4c7127f776967c1276544571be7d19d7efa2.zip |
[C++] Remove --gen_regen_rule
No one uses this.
-rw-r--r-- | flags.cc | 4 | ||||
-rw-r--r-- | flags.h | 1 | ||||
-rw-r--r-- | ninja.cc | 24 |
3 files changed, 2 insertions, 27 deletions
@@ -100,10 +100,6 @@ void Flags::Parse(int argc, char** argv) { "--ninja_dir", argv, &i, &ninja_dir)) { } else if (!strcmp(arg, "--use_find_emulator")) { use_find_emulator = true; - } else if (!strcmp(arg, "--gen_regen_rule")) { - // TODO: Make this default once we have removed unnecessary - // command line change from Android build. - gen_regen_rule = true; } else if (ParseCommandLineOptionWithArg( "--goma_dir", argv, &i, &goma_dir)) { } else if (ParseCommandLineOptionWithArg( @@ -29,7 +29,6 @@ struct Flags { bool enable_kati_warnings; bool enable_stat_logs; bool gen_all_targets; - bool gen_regen_rule; bool generate_ninja; bool is_dry_run; bool is_silent_mode; @@ -201,7 +201,7 @@ class NinjaGenerator { const string& orig_args) { unlink(GetNinjaStampFilename().c_str()); PopulateNinjaNodes(nodes); - GenerateNinja(orig_args); + GenerateNinja(); GenerateShell(); GenerateStamp(orig_args); } @@ -574,29 +574,11 @@ class NinjaGenerator { } } - void EmitRegenRules(const string& orig_args) { - if (!g_flags.gen_regen_rule) - return; - - fprintf(fp_, "rule regen_ninja\n"); - fprintf(fp_, " command = %s\n", orig_args.c_str()); - fprintf(fp_, " generator = 1\n"); - fprintf(fp_, " description = Regenerate ninja files due to dependency\n"); - fprintf(fp_, "build %s: regen_ninja", GetNinjaFilename().c_str()); - unordered_set<string> makefiles; - MakefileCacheManager::Get()->GetAllFilenames(&makefiles); - for (const string& makefile : makefiles) { - fprintf(fp_, " %.*s", SPF(makefile)); - } - fprintf(fp_, " %s", kati_binary_.c_str()); - fprintf(fp_, "\n\n"); - } - static string GetEnvScriptFilename() { return GetFilename("env%s.sh"); } - void GenerateNinja(const string& orig_args) { + void GenerateNinja() { ScopedTimeReporter tr("ninja gen (emit)"); fp_ = fopen(GetNinjaFilename().c_str(), "wb"); if (fp_ == NULL) @@ -622,8 +604,6 @@ class NinjaGenerator { fprintf(fp_, "build _kati_always_build_: phony\n\n"); - EmitRegenRules(orig_args); - unique_ptr<ThreadPool> tp(NewThreadPool(g_flags.num_jobs)); CHECK(g_flags.num_jobs); int num_nodes_per_task = nodes_.size() / (g_flags.num_jobs * 10) + 1; |