Merge remote-tracking branch 'aosp/upstream'

For 7eac665 to fix b/26880753.

7eac665 [C++] Handle multiple implicit patterns properly
88150d4 [C++] Fix a minor typo
844ff75 [C++] Add a target which builds tsan-enabled kati

Bug: 26880753
Change-Id: I7999a6e8a28361c66e57301641bd13269bd23584
tree: 7f90de91e3181136d0fe695923c4a186c8a38e7c
  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. condvar.cc
  15. condvar.h
  16. CONTRIBUTING.md
  17. CONTRIBUTORS
  18. dep.cc
  19. dep.go
  20. dep.h
  21. depgraph.go
  22. doc.go
  23. eval.cc
  24. eval.go
  25. eval.h
  26. evalcmd.go
  27. exec.cc
  28. exec.go
  29. exec.h
  30. expr.cc
  31. expr.go
  32. expr.h
  33. expr_test.go
  34. file.cc
  35. file.h
  36. file_cache.cc
  37. file_cache.h
  38. fileutil.cc
  39. fileutil.go
  40. fileutil.h
  41. find.cc
  42. find.h
  43. find_test.cc
  44. flags.cc
  45. flags.go
  46. flags.h
  47. func.cc
  48. func.go
  49. func.h
  50. func_test.go
  51. INTERNALS.md
  52. io.cc
  53. io.h
  54. LICENSE
  55. loc.h
  56. log.cc
  57. log.go
  58. log.h
  59. m2n
  60. main.cc
  61. make-c.sh
  62. Makefile
  63. Makefile.ckati
  64. Makefile.kati
  65. mutex.cc
  66. mutex.h
  67. ninja.cc
  68. ninja.go
  69. ninja.h
  70. ninja_test.cc
  71. ninja_test.go
  72. pack.sh
  73. parser.cc
  74. parser.go
  75. parser.h
  76. pathutil.go
  77. pathutil_test.go
  78. query.go
  79. README.md
  80. regen.cc
  81. regen.h
  82. rule.cc
  83. rule.h
  84. rule_parser.go
  85. rule_parser_test.go
  86. run_integration_test.rb
  87. runtest.rb
  88. serialize.go
  89. shellutil.go
  90. shellutil_test.go
  91. stats.cc
  92. stats.go
  93. stats.h
  94. stmt.cc
  95. stmt.h
  96. string_piece.cc
  97. string_piece.h
  98. string_piece_test.cc
  99. stringprintf.cc
  100. stringprintf.h
  101. strutil.cc
  102. strutil.go
  103. strutil.h
  104. strutil_test.cc
  105. strutil_test.go
  106. symtab.cc
  107. symtab.go
  108. symtab.h
  109. testutil.h
  110. thread.cc
  111. thread.h
  112. thread_local.h
  113. thread_pool.cc
  114. thread_pool.h
  115. timeutil.cc
  116. timeutil.h
  117. var.cc
  118. var.go
  119. var.h
  120. version.go
  121. version.h
  122. version_unknown.cc
  123. 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