Merge remote-tracking branch 'aosp/upstream'

- 7cf1935 for 26707439
- 271c580 for 26438312
- 6bbf9e2 for 3x faster --regen

6ca9cfe [C++] Use thraed_local keyword on linux again
c8154bd [C++] Fix a race in stats.cc
12f41b6 [C++] static_pattern.mk is passing
ceedf3f Do not use implicit wildcard in prerequisites
fcbadb2 [C++] Trim leading ./ in output patterns
7cf1935 [C++] Show an error message when exec in RunCommand fails
271c580 [C++] Fix target specific variables in implicit rules
4197da6 [C++] Fix Mac build by using pthread's TLS
6bbf9e2 [C++] Run the regeneration check in parallel
8ef0ce5 [C++] Move NeedsRegen from ninja.cc to regen.cc
23a0c47 [C++] Make kati stats thread safe
9588ae9 [C++] Do not calculate stats without --kati_stats

Bug: 26707439
Bug: 26438312
Change-Id: I5aed3af2fe71e541edaf22a15100492df1e33210
tree: e48e83a79df7038ffaa9e118dde7da0c04311759
  1. cmd/
  2. make-c/
  3. testcase/
  4. .gitignore
  5. .travis.yml
  6. Android.bp
  7. ast.go
  8. AUTHORS
  9. bootstrap.go
  10. buf.go
  11. buf_test.go
  12. command.cc
  13. command.h
  14. CONTRIBUTING.md
  15. CONTRIBUTORS
  16. dep.cc
  17. dep.go
  18. dep.h
  19. depgraph.go
  20. doc.go
  21. eval.cc
  22. eval.go
  23. eval.h
  24. evalcmd.go
  25. exec.cc
  26. exec.go
  27. exec.h
  28. expr.cc
  29. expr.go
  30. expr.h
  31. expr_test.go
  32. file.cc
  33. file.h
  34. file_cache.cc
  35. file_cache.h
  36. fileutil.cc
  37. fileutil.go
  38. fileutil.h
  39. find.cc
  40. find.h
  41. find_test.cc
  42. flags.cc
  43. flags.go
  44. flags.h
  45. func.cc
  46. func.go
  47. func.h
  48. func_test.go
  49. INTERNALS.md
  50. io.cc
  51. io.h
  52. LICENSE
  53. loc.h
  54. log.cc
  55. log.go
  56. log.h
  57. m2n
  58. main.cc
  59. make-c.sh
  60. Makefile
  61. Makefile.ckati
  62. Makefile.kati
  63. ninja.cc
  64. ninja.go
  65. ninja.h
  66. ninja_test.cc
  67. ninja_test.go
  68. pack.sh
  69. parser.cc
  70. parser.go
  71. parser.h
  72. pathutil.go
  73. pathutil_test.go
  74. query.go
  75. README.md
  76. regen.cc
  77. regen.h
  78. rule.cc
  79. rule.h
  80. rule_parser.go
  81. rule_parser_test.go
  82. run_integration_test.rb
  83. runtest.rb
  84. serialize.go
  85. shellutil.go
  86. shellutil_test.go
  87. stats.cc
  88. stats.go
  89. stats.h
  90. stmt.cc
  91. stmt.h
  92. string_piece.cc
  93. string_piece.h
  94. string_piece_test.cc
  95. stringprintf.cc
  96. stringprintf.h
  97. strutil.cc
  98. strutil.go
  99. strutil.h
  100. strutil_test.cc
  101. strutil_test.go
  102. symtab.cc
  103. symtab.go
  104. symtab.h
  105. testutil.h
  106. thread.cc
  107. thread.h
  108. thread_local.h
  109. timeutil.cc
  110. timeutil.h
  111. var.cc
  112. var.go
  113. var.h
  114. version.go
  115. version.h
  116. version_unknown.cc
  117. worker.go
README.md

kati

Build Status

kati is an experimental GNU make clone. The main goal of this tool is to speed-up incremental build of Android.

Currently, kati does not offer a faster build by itself. It instead converts your Makefile to a ninja file.

How to use for Android

Now AOSP has kati and ninja, so all you have to do is

% export USE_NINJA=true

All Android's build commands (m, mmm, mmma, etc.) should just work.

How to use for Android (deprecated way)

Set up kati:

% cd ~/src
% git clone https://github.com/google/kati
% cd kati
% make

Build Android:

% cd <android-directory>
% source build/envsetup.sh
% lunch <your-choice>
% ~/src/kati/m2n --kati_stats  # Use --goma if you are a Googler.
% ./ninja.sh

You need ninja in your $PATH.

More usage examples (deprecated way)

"make clean"

% ./ninja.sh -t clean

Note ./ninja.sh passes all parameters to ninja.

Build a specific target

For example, the following is equivalent to "make cts":

% ./ninja.sh cts

Or, if you know the path you want, you can do:

% ./ninja.sh out/host/linux-x86/bin/adb