aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Snap for 6511878 from c9944506d55d22cfa6cf5e3f6a991923c2547ebf to rvc-releaseandroid-vts-11.0_r5android-vts-11.0_r4android-vts-11.0_r3android-vts-11.0_r2android-vts-11.0_r1android-security-11.0.0_r1android-platform-11.0.0_r2android-platform-11.0.0_r1android-cts-11.0_r5android-cts-11.0_r4android-cts-11.0_r3android-cts-11.0_r2android-cts-11.0_r1android-11.0.0_r5android-11.0.0_r4android-11.0.0_r3android-11.0.0_r25android-11.0.0_r2android-11.0.0_r17android-11.0.0_r1android11-tests-releaseandroid11-security-releaseandroid11-s1-releaseandroid11-releaseandroid-build-team Robot2020-05-204-25/+168
|\
| * Merge remote-tracking branch 'goog/mirror-aosp-master' into rvc-devandroid11-devColin Cross2020-05-184-25/+168
| |\
| | * Merge remote-tracking branch 'aosp/upstream'Colin Cross2020-05-184-25/+168
| | |\
| | | * Merge pull request #299 from paulduffin/mastercolincross2020-05-143-10/+139
| | | |\
| | | | * Support checking syntax of generated Blueprint filesPaul Duffin2020-05-133-10/+139
| | | |/
| | | * Merge pull request #298 from colincross/blueprint_testscolincross2020-05-121-15/+29
| | | |\
| | | | * Always emit rules for tests and add phony to run themColin Cross2020-05-121-15/+29
| | | |/
* | | | Snap for 6473661 from 300b6297f496bb032ec59d9df0ecb4f097fdb772 to rvc-releaseandroid-build-team Robot2020-05-082-6/+25
|\| | |
| * | | Merge remote-tracking branch 'goog/mirror-aosp-master' into rvc-devColin Cross2020-05-072-6/+25
| |\| |
| | * | Merge remote-tracking branch 'aosp/upstream'Colin Cross2020-05-041-6/+19
| | |\|
| | | * Merge pull request #297 from paulduffin/mastercolincross2020-05-041-6/+19
| | | |\
| | | | * Run LoadHooks before registering modulePaul Duffin2020-05-041-6/+19
| | | |/
| | * | Merge remote-tracking branch 'aosp/upstream'Dan Willemsen2020-04-191-0/+6
| | |\|
| | | * Merge pull request #296 from danw/emptyfileDan Willemsen2020-04-191-0/+6
| | | |\
| | | | * Actually write an empty ninja file with --empty-ninja-fileDan Willemsen2020-04-191-0/+6
| | | |/
* | | | Snap for 6392464 from 681e941f424b34b3a6b775eb9e0d0c0ec633e8e2 to rvc-releaseandroid-build-team Robot2020-04-1413-213/+1015
|\| | |
| * | | Merge remote-tracking branch 'goog/mirror-aosp-master' into rvc-devColin Cross2020-04-0913-213/+1015
| |\| |
| | * | Merge remote-tracking branch 'aosp/upstream'Colin Cross2020-04-023-38/+156
| | |\|
| | | * Merge pull request #293 from paulduffin/mastercolincross2020-04-022-34/+132
| | | |\
| | | | * WalkDeps - only record module visited when it has been recursed intoPaul Duffin2020-04-022-34/+132
| | | |/
| | | * Merge pull request #292 from paulduffin/mastercolincross2020-04-011-0/+14
| | | |\
| | | | * Allow missing variants when allowMissingDependencies=truePaul Duffin2020-03-241-0/+14
| | | |/
| | | * Merge pull request #291 from silverneko/bpmodify-exitDan Willemsen2020-03-051-1/+6
| | | |\
| | | | * bpmodify: fix os.Exit() shouldn't shadow panic()Yo Chiang2020-03-051-1/+6
| | | |/
| | | * Merge pull request #290 from silverneko/bpmodify-exitcodeDan Willemsen2020-03-041-2/+3
| | | |\
| | | | * bpmodify: respect exitCodeYo Chiang2020-03-051-2/+3
| | | * | Merge pull request #289 from silverneko/bpmodify-usageDan Willemsen2020-03-041-2/+2
| | | |\ \
| | | | * | Set bpmodify usage functionYo Chiang2020-03-041-2/+2
| | | | |/
| | * | | Merge changes Id1b9ae00,I48723e00android-r-preview-4android-r-preview-3android-r-preview-2Treehugger Robot2020-03-0510-166/+859
| | |\ \ \
| | | * | | Merge remote-tracking branch 'upstream/master' into upstream_mergeSasha Smundak2020-03-043-28/+38
| | | |\| |
| | | | * | Merge pull request #288 from asmundak/masterasmundak2020-03-042-27/+37
| | | | |\ \ | | | | | |/ | | | | |/|
| | | | | * Fix bug in buildPropertyMap in previous commit.Sasha Smundak2020-03-032-27/+37
| | | | * | Merge pull request #287 from colincross/mutator_ninja_file_depscolincross2020-03-031-1/+1
| | | | |\ \
| | | | | * | Fix missing dependencies from mutatorsColin Cross2020-03-031-1/+1
| | | * | | | Merge remote-tracking branch 'upstream/master' into upstream_mergeSasha Smundak2020-03-029-161/+844
| | | |\| | |
| | | | * | | Merge pull request #286 from asmundak/masterasmundak2020-03-029-161/+844
| | | | |\ \ \ | | | | | |/ / | | | | |/| / | | | | | |/
| | | | | * Implement list of mapsSasha Smundak2020-03-029-161/+844
| | | | |/
| | * | | In kzip files, compilation unit paths should be relative to top. am: 59a3a23e92Automerger Merge Worker2020-02-261-9/+0
| | |\| |
| | | * | In kzip files, compilation unit paths should be relative to top.Sasha Smundak2020-02-251-9/+0
* | | | | Snap for 6188643 from 6f2cd91c327f8a628718056038a3d5732c752b37 to rvc-releaseandroid-build-team Robot2020-02-0710-70/+262
|\| | | |
| * | | | Merge remote-tracking branch 'aosp/upstream' into uppercase_properties am: f0...Automerger Merge Worker2020-02-0610-70/+262
| |\ \ \ \
| | * | | | Merge remote-tracking branch 'aosp/upstream' into uppercase_properties am: f0...Automerger Merge Worker2020-02-0610-70/+262
| | |\| | |
| | | * | | Merge remote-tracking branch 'aosp/upstream' into uppercase_properties am: f0...Automerger Merge Worker2020-02-0610-70/+262
| | | |\| |
| | | | * | Merge remote-tracking branch 'aosp/upstream' into uppercase_propertiesColin Cross2020-02-0510-70/+262
| | | | |\|
| | | | | * Merge pull request #284 from colincross/uppercase_propertiescolincross2020-02-052-3/+24
| | | | | |\
| | | | | | * Fix PropertyNameForField for X86.Colin Cross2020-02-052-3/+24
| | | | | |/
| | | | | * Merge pull request #283 from colincross/uppercase_propertiescolincross2020-02-053-0/+123
| | | | | |\
| | | | | | * Support unpacking capitalized property namesColin Cross2020-02-053-0/+123
| | | | | * | Merge pull request #282 from colincross/ninjastringcolincross2020-01-297-70/+118
| | | | | |\ \ | | | | | | |/ | | | | | |/|
| | | | | | * Make ninjaString an interfaceColin Cross2020-01-297-70/+118
| | | | | |/