commit | 786881c217e1d4c3715e7d3dea6eb062677180e1 | [log] [tgz] |
---|---|---|
author | Stefan Becker <stefanb@gpartner-nvidia.com> | Fri Apr 08 15:45:16 2016 +0300 |
committer | Stefan Becker <stefanb@gpartner-nvidia.com> | Tue Apr 12 12:31:46 2016 +0300 |
tree | 9d6b1e665589fa2dc4e306c9c7810ba4e14c56d5 | |
parent | d4f287145feb677e99f0bf30fa6a0e14bd79f896 [diff] |
[C++] Replace erroneous return in EvalInclude() We need to continue the loop, not abort the function, otherwise kati will ignore include files that should not be ignored. Test case: $ cat Makefile.minus-include-main .PHONY: default default: -include Makefile.minus-include-? $ cat Makefile.minus-include-a $(info include a...) $ cat Makefile.minus-include-b $(info include b...) $ ckati --warn --gen_all_targets --regen --ninja -f Makefile.minus-include-main include b... include a... $ ckati --warn --gen_all_targets --regen --ninja -f Makefile.minus-include-main --ignore_optional_include=Makefile.minus-include-a arguments changed, regenerating... include b... $ ckati --warn --gen_all_targets --regen --ninja -f Makefile.minus-include-main --ignore_optional_include=Makefile.minus-include-b arguments changed, regenerating... Fixes https://github.com/google/kati/issues/54 Change-Id: I139392510b02d48c224edf4a8e6e186d52f26699
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