tag | 50fdab30c461c917c6731c0ccbe2a69ac41ba641 | |
---|---|---|
tagger | The Android Open Source Project <initial-contribution@android.com> | Mon Jun 27 10:36:55 2016 -0700 |
object | ff2d59e2e082d17ae04f43d409244440a1687856 |
Android N Preview 4 (NPD56N)
commit | ff2d59e2e082d17ae04f43d409244440a1687856 | [log] [tgz] |
---|---|---|
author | Colin Cross <ccross@android.com> | Mon May 30 13:43:15 2016 -0700 |
committer | Colin Cross <ccross@android.com> | Mon May 30 13:43:49 2016 -0700 |
tree | a00ee4a558330113761d89371b196614820e6d94 | |
parent | ce34badf691d36e8048b63f89d1a86ee5fa4325c [diff] | |
parent | 390115c9f284c66aeda94d36e01533f7b668627d [diff] |
Merge remote-tracking branch 'aosp/upstream' into master 390115c Handle nested define/endef c15a824 Update findleaves.py and add a few testcases af13468 Merge pull request #73 from colincross/findleaves f0a6fdf [C++] Add support for multiple filenames to findleaves emulation 1c3a695 Support all kinds of command line variables ac6f169 Allow NULL filename for -d flag c58db9a [C++] Add -d flag to make debugging slightly easier 38892d8 Normalize log for recent ninja 9f6343c Always sort glob results 8082dcb Skip 3 tests which fail with make 4 1561f68 Skip shell_var_with_args.mk with GNU make 4 a1ded1c Use override in posix_var.mk to fix test with make 4 fc24bd2 Stop overwriting /bin/sh by bash on travis 913eb74 Normalize Unicode quotes for recent find 2d2ed95 Explicitly use SHELL=/bin/bash d07e297 [C++] Stop using an uninitialized value 855fea4 Fix multi_implicit_output_patterns.mk for GNU make 4 dc258cb Clean up normalization in runtest.rb a bit 3009771 Merge pull request #66 from stefanb2/topic-issue-65 bfae810 Remove test output in ckati_clean a24a7a0 Normalize GNU make 4.00 in runtest.rb e4e56f3 Suppress GNU make jobserver magic in runtest.rb 2941ea0 [C++] Handle .POSIX at eval time 03fa345 Add testcase/posix_var.mk a8fafa4 Remove Go related targets from test and clean d8d43ea [C++] Reduce unnecessary string allocation c6926b0 Add testcase/call_with_whitespace.mk 5dfb361 Add testcase/recursive_marker.mk 02e5ee3 [C++] Remove unnecessary #include 6823600 Add a test case to override_override.mk 4e60e5f Merge pull request #58 from stefanb2/topic-issue-57 952d445 [C++] Ignore recursive marker in recipes 786881c [C++] Replace erroneous return in EvalInclude() d4f2871 [C++] Store SHELL value in command result 29b9b74 [C++] Honor "override" when setting global variable 167e1f7 [C++] Ignore white space around $(call) function name 187bf08 [C++] Add support for .POSIX: cd060c5 add Stefan to CONTRIBUTORS Change-Id: I7697703aa2a0eb37202645b1895899807e6426b2
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.
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.
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.
% ./ninja.sh -t clean
Note ./ninja.sh passes all parameters to ninja.
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