aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * Add support for --default_pool in ninja modeColin Cross2019-11-114-6/+74
| |/
* | Merge remote-tracking branch 'aosp/upstream'Colin Cross2019-09-233-5/+11
|\|
| * Merge pull request #168 from colincross/suffix_rulescolincross2019-09-233-5/+11
| |\
| | * Refine check for special targets and suffix rulesColin Cross2019-09-233-5/+11
| |/
* | Merge remote-tracking branch 'aosp/upstream'Dan Willemsen2019-08-218-124/+97
|\|
| * Merge pull request #167 from danw/profileDan Willemsen2019-08-212-1/+2
| |\
| | * Fix 32-bit builds; only build 64-bit in Android treesDan Willemsen2019-08-212-1/+2
| |/
| * Merge pull request #166 from danw/profileDan Willemsen2019-08-147-124/+96
| |\
| | * Collect stats about how long it takes to process included makefilesDan Willemsen2019-08-135-0/+50
| | * When printing top stats, include countDan Willemsen2019-08-133-13/+35
| | * Stop using TLS for stats start timeDan Willemsen2019-08-123-111/+11
| |/
* | DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Xin Li2019-02-200-0/+0
|\ \
| * \ Merge remote-tracking branch 'aosp/upstream' into update am: 6a94855578Dan Willemsen2019-01-1120-92/+112
| |\ \
| * \ \ [automerger skipped] DO NOT MERGE am: 679d6bb847 -s oursXin Li2018-12-100-0/+0
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'aosp/upstream' am: 667d0786cfDan Willemsen2018-10-311-0/+3
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'aosp/upstream' am: 2de6712ec4Dan Willemsen2018-10-264-9/+15
| |\ \ \ \ \
| * \ \ \ \ \ [automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ...Bill Yi2018-10-240-0/+0
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'aosp/upstream' am: 4ac13f512aDan Willemsen2018-10-092-2/+6
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'aosp/upstream' into master am: bb306940b7Dan Willemsen2018-09-283-6/+11
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Link ckati against jemalloc if host machine runs Linux. am: d9bf6268deSasha Smundak2018-09-201-0/+5
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'aosp/upstream' into master am: b659248e4aDan Willemsen2018-09-173-14/+30
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ [automerger] Support git submodules in version.cc generation. am: 3b166ce40a ...JP Sugarbroad2018-09-071-2/+2
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'aosp/upstream' into master am: 18e9d8b32bSasha Smundak2018-08-3123-453/+763
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'aosp/upstream' into mymerge am: cdc359b7f7 am: ...Sasha Smundak2018-08-019-42/+92
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into masterXin Li2019-02-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ DO NOT MERGE - Merge PPRL.190205.001 into masterandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-releaseXin Li2019-02-181-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-ma...Xin Li2019-02-121-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 5180536 from 2a49513da00436f434281a98dfb118db855db013 to pi-platform...pie-platform-releaseandroid-build-team Robot2019-02-091-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 5044688 from d019345012951498cda181caed55908f7fe4f801 to pi-qpr2-rel...android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31pie-qpr2-releaseandroid-build-team Robot2018-10-021-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | [automerger] Support git submodules in version.cc generation. am: 3b166ce40a ...android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r37android-9.0.0_r36pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-b4s4-devJP Sugarbroad2018-09-071-2/+2
| | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | [automerger] Support git submodules in version.cc generation. am: 3b166ce40a ...JP Sugarbroad2018-09-071-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger] Support git submodules in version.cc generation. am: 3b166ce40a ...JP Sugarbroad2018-09-071-2/+2
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger] Support git submodules in version.cc generation. am: 3b166ce40a ...Android Build Merger (Role)2018-08-281-2/+2
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger] Support git submodules in version.cc generation. am: 3b166ce40a ...Android Build Merger (Role)2018-08-281-2/+2
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | * | | | | | | | | | | | | | | [automerger] Support git submodules in version.cc generation. am: 3b166ce40a ...Android Build Merger (Role)2018-08-281-2/+2
| | | | | | |/| | | | | | | | | | | | | | |
| | | | | | | * | | | | | | | | | | | | | | [automerger] Support git submodules in version.cc generation. am: 3b166ce40a ...Android Build Merger (Role)2018-08-281-2/+2
| | | | | | |/| | | | | | | | | | | | | | |
| | | | | | | * | | | | | | | | | | | | | | [automerger] Support git submodules in version.cc generation. am: 3b166ce40aAndroid Build Merger (Role)2018-08-281-2/+2
| | | | | | |/| | | | | | | | | | | | | | |
| | | | | | | * | | | | | | | | | | | | | | Support git submodules in version.cc generation.JP Sugarbroad2018-08-281-2/+2
| | | | | | |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'aosp/upstream'Dan Willemsen2019-01-224-1/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'aosp/upstream'Dan Willemsen2019-01-224-1/+51
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge pull request #164 from danw/top_level_phonyDan Willemsen2019-01-224-1/+51
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | Add --top_level_phonyDan Willemsen2019-01-214-1/+51
| | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | / Merge remote-tracking branch 'aosp/upstream' into updateDan Willemsen2019-01-1120-92/+112
|\| | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'aosp/upstream' into updateDan Willemsen2019-01-1120-92/+112
| |\| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge pull request #163 from danw/random_affinityDan Willemsen2019-01-111-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | Use std::random_device instead of initializing via getpidDan Willemsen2019-01-111-1/+1
| | * | | | | | | | | | | | | | | | | | Merge pull request #162 from Martin-Hsu/masterDan Willemsen2018-12-051-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | Fix undeclared identifier 'exit' on Mac.Martin Hsu2018-12-061-0/+1
| | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | Merge pull request #161 from colincross/implicit_outputs_segfaultcolincross2018-11-121-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | Fix segfault when reporting implicit outputs errorColin Cross2018-11-121-1/+1
| | |/ / / / / / / / / / / / / / / / / /