aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge stage-aosp-master into pi-dev-plus-aospXin Li2019-02-250-0/+0
|\| | | | |
| * | | | | Merge stage-aosp-master into pi-dev-plus-aospXin Li2019-02-250-0/+0
| |\| | | |
| | * | | | DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li2019-02-200-0/+0
| | |\ \ \ \
* | | | | | | Add asmundak and jungjw to OWNERS am: f01f87af85 am: 969f1e6416Dan Willemsen2019-02-191-0/+2
|\| | | | | |
| * | | | | | Add asmundak and jungjw to OWNERS am: f01f87af85Dan Willemsen2019-02-191-0/+2
| |\| | | | |
| | * | | | | Add asmundak and jungjw to OWNERSDan Willemsen2019-02-191-0/+2
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Add asmundak and jungjw to OWNERSDan Willemsen2019-02-201-0/+2
* | | | | | | Merge remote-tracking branch 'aosp/upstream' into master am: 012c4ff202 am: 0...Sasha Smundak2019-02-191-3/+3
|\| | | | | |
| * | | | | | Merge remote-tracking branch 'aosp/upstream' into master am: 012c4ff202Sasha Smundak2019-02-191-3/+3
| |\| | | | |
| | * | | | | Merge remote-tracking branch 'aosp/upstream' into masterSasha Smundak2019-02-191-3/+3
| | |\| | | |
| | | * | | | Merge remote-tracking branch 'aosp/upstream' into masterSasha Smundak2019-02-191-3/+3
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| | | | * | | Merge pull request #235 from asmundak/collapseduplicateasmundak2019-02-171-3/+3
| | | | |\ \ \
| | | | | * | | Export CollapseDuplicateProperties, Soong writedocs uses itSasha Smundak2019-02-141-3/+3
* | | | | | | | Merge remote-tracking branch 'aosp/upstream' into master am: 1387a00b5f am: d...Colin Cross2019-02-151-5/+18
|\| | | | | | |
| * | | | | | | Merge remote-tracking branch 'aosp/upstream' into master am: 1387a00b5fColin Cross2019-02-151-5/+18
| |\| | | | | |
| | * | | | | | Merge remote-tracking branch 'aosp/upstream' into masterColin Cross2019-02-151-5/+18
| | |\| | | | |
| | | * | | | | Merge remote-tracking branch 'aosp/upstream' into masterColin Cross2019-02-151-5/+18
| | | |\| | | |
| | | | * | | | Merge pull request #236 from colincross/examplescolincross2019-02-151-5/+18
| | | | |\ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | | | * | | Support examples as testsColin Cross2019-02-151-5/+18
| | | | |/ / /
* | | | | | | Merge remote-tracking branch 'aosp/upstream' am: e2f3158478 am: 676fb278d8Jaewoong Jung2019-02-137-430/+755
|\| | | | | |
| * | | | | | Merge remote-tracking branch 'aosp/upstream' am: e2f3158478Jaewoong Jung2019-02-137-430/+755
| |\| | | | |
| | * | | | | Merge remote-tracking branch 'aosp/upstream'Jaewoong Jung2019-02-137-430/+755
| | |\| | | |
| | | * | | | Merge remote-tracking branch 'aosp/upstream'Jaewoong Jung2019-02-137-430/+755
| | | |\| | |
| | | | * | | Merge pull request #234 from gyias/bpdocJaewoong Jung2019-02-127-430/+755
| | | | |\ \ \
| | | | | * | | bpdoc improvementsJaewoong Jung2019-02-087-430/+755
| | | | |/ / /
* | | | | | | Merge remote-tracking branch 'aosp/upstream' into master am: 0a9f800555 am: 2...Colin Cross2019-01-245-142/+200
|\| | | | | |
| * | | | | | Merge remote-tracking branch 'aosp/upstream' into master am: 0a9f800555Colin Cross2019-01-245-142/+200
| |\| | | | | | | |_|_|/ / | |/| | | |
| | * | | | Merge remote-tracking branch 'aosp/upstream' into masterColin Cross2019-01-245-142/+200
| | |\| | |
| | | * | | Merge remote-tracking branch 'aosp/upstream' into masterColin Cross2019-01-245-142/+200
| | | |\| |
| | | | * | Merge pull request #231 from colincross/pprofcolincross2019-01-245-142/+200
| | | | |\ \
| | | | | * | Use sync.Map for type field cacheColin Cross2019-01-231-32/+9
| | | | | * | Write ninja file directly to the output fileColin Cross2019-01-234-14/+46
| | | | | * | Add pprof labelsColin Cross2019-01-231-96/+145
| | | | |/ /
* | | | | | Merge branch 'master' of https://github.com/google/blueprint into 20181226165...Steven Moreland2018-12-271-1/+8
|\| | | | |
| * | | | | Merge branch 'master' of https://github.com/google/blueprint into 20181226165...Steven Moreland2018-12-271-1/+8
| |\| | | |
| | * | | | Merge branch 'master' of https://github.com/google/blueprint into 20181226165820Steven Moreland2018-12-271-1/+8
| | |\| | |
| | | * | | Merge branch 'master' of https://github.com/google/blueprint into 20181226165820Steven Moreland2018-12-271-1/+8
| | | |\| |
| | | | * | Merge pull request #230 from smore-lore/masterDan Willemsen2018-12-261-1/+8
| | | | |\ \
| | | | | * | bpmodify: add argument if it is missingSteven Moreland2018-12-171-1/+8
| | | | |/ /
* | | | | | [automerger skipped] DO NOT MERGE am: 8983c53590 -s ours am: 6af6da9180 -s ...Xin Li2018-12-100-0/+0
|\| | | | |
| * | | | | [automerger skipped] DO NOT MERGE am: 8983c53590 -s oursXin Li2018-12-100-0/+0
| |\| | | |
| | * | | | [automerger skipped] DO NOT MERGEXin Li2018-12-100-0/+0
| | |\| | |
| | | * | | DO NOT MERGEXin Li2018-12-070-0/+0
| | | |\ \ \
* | | | | | | Merge remote-tracking branch 'aosp/upstream' am: b19ead4ea0 am: e28f74225dDan Willemsen2018-10-304-0/+17
|\| | | | | |
| * | | | | | Merge remote-tracking branch 'aosp/upstream' am: b19ead4ea0Dan Willemsen2018-10-304-0/+17
| |\| | | | |
| | * | | | | Merge remote-tracking branch 'aosp/upstream'Dan Willemsen2018-10-304-0/+17
| | |\| | | |
| | | * | | | Merge remote-tracking branch 'aosp/upstream'Dan Willemsen2018-10-264-0/+17
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| | | | * | | Merge pull request #228 from danw/empty_ninja_fileDan Willemsen2018-10-264-0/+17
| | | | |\ \ \
| | | | | * | | Add --empty-ninja-file for test usecasesDan Willemsen2018-10-264-0/+17
| | | | |/ / /
* | | | | | | Merge remote-tracking branch 'aosp/upstream' into master am: bb465da5f9 am: a...Colin Cross2018-10-241-1/+1
|\| | | | | |