platform_build_kati, branch marshmallow-mr2-release

Manually merge AOSP into nyc-dev

2016-03-25T21:00:50+00:00

Bug: 26839129
Change-Id: Ifbeb031a3c30acdb0dc0f5e218f9f8c53b91553e

Merge remote-tracking branch 'aosp/upstream'

2016-03-16T21:30:31+00:00

There was a regression in the previous merge.

f124de0 Put a whitespace for subshell before a close paren
ce7a2b4 Add a whitespace after an open paren for subshell

Change-Id: Id14d00bc0549e37a8c0e0b8990753b4f74f3a538

Put a whitespace for subshell before a close paren

2016-03-16T21:18:32+00:00

instead of after an open paren.

Add a whitespace after an open paren for subshell

2016-03-16T21:02:18+00:00

Merge remote-tracking branch 'aosp/upstream'

2016-03-14T23:40:02+00:00

This fixes three bugs and disables the depfile detection. The
depfile detection is not necessary anymore as we use
.KATI_DEPFILE explicitly.

b3d01c4 Merge remote-tracking branch 'aosp/upstream' into merge20
044a51d Fix https://github.com/google/kati/issues/47
c3a4834 Use subshell even when a command starts with '('
f3ad9e0 Detect depfiles only when --detect_depfiles is specified
e6a4d17 Fix https://github.com/google/kati/issues/46

Change-Id: I82252a6d2fd77e095866e7b0820e04268555c78c

Fix https://github.com/google/kati/issues/47

2016-03-14T23:35:45+00:00

Use subshell even when a command starts with '('

2016-03-14T23:35:45+00:00

Detect depfiles only when --detect_depfiles is specified

2016-03-14T23:35:45+00:00

This makes generation time ~5% faster.

Fix https://github.com/google/kati/issues/46

2016-03-10T05:47:34+00:00

Merge remote-tracking branch 'aosp/upstream'

2016-03-01T03:22:57+00:00

These commits should have fixed b/27381403 and made the code
slightly more robust against similar issues.

3835aca [C++] Update Android.bp
4a88802 [C++] Honor string length in FindEndOfLine
0140629 [C++] Finish FindEndOfLine at NULL characeter
0755047 [C++] NULL terminate the buffer of files

Bug: 27381403
Change-Id: Idd79743ce9a4718f7597573118115497f552c532