aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Snap for 6844436 from 599ec7fb173264f0b08a1cb0b47f3799b29e947d to simp...simpleperf-releaseandroid-build-prod (mdb)2020-09-170-0/+0
|\
| * Snap for 6844436 from 599ec7fb173264f0b08a1cb0b47f3799b29e947d to simpleperf-...android-build-prod (mdb)2020-09-170-0/+0
|/|
| * Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as mergedHEADmasterXin Li2020-08-270-0/+0
| |\
| | * [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...Xin Li2020-04-100-0/+0
| | |\
| | * \ Merge "Fix mac builds" am: 48ed0ceaa5 am: e1cbcb84b6Treehugger Robot2020-04-013-869/+0
| | |\ \
| | * \ \ Merge "Upgrade to upstream v3.3 and add METADATA." am: 14258db31a am: d04714f814Treehugger Robot2020-03-30310-8351/+46359
| | |\ \ \
| | * \ \ \ Merge "Remove redundant NOTICE copied from LICENSE." am: 1246a03894 am: b8074...Treehugger Robot2020-03-261-21/+0
| | |\ \ \ \
| | * \ \ \ \ [automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915...android-mainline-11.0.0_r1android11-mainline-releaseandroid11-devXin Li2019-10-300-0/+0
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge "Fix mac build; add closures.c for python3" am: 46321e5e76 am: a1484ea0...Dan Willemsen2019-10-241-0/+13
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge "Add host support to libffi for crosvm." am: c07e72f5d8 am: 58d2fca6a8 ...Ivan Lozano2019-09-091-0/+1
| | |\ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ Merge "Snap for 6792789 from 9fb4309776d6ee13b9d65a0ea0e68173ef3ef72f to simp...android-build-prod (mdb)2020-08-265-1358/+18
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Snap for 6792789 from 9fb4309776d6ee13b9d65a0ea0e68173ef3ef72f to simpleperf-...android-build-prod (mdb)2020-08-265-1358/+18
|/| | | | | | | | | | | |/ / / / / / / / /
| * | | | | | | | | Merge "Switch .eh_frame to readonly (from "aw" to "a")." am: 603e044759Treehugger Robot2020-08-211-2/+2
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge "Switch .eh_frame to readonly (from "aw" to "a")."Treehugger Robot2020-08-211-2/+2
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Switch .eh_frame to readonly (from "aw" to "a").Stephen Hines2020-08-201-2/+2
| | |/ / / / / / / / /
| * | | | | | | | | | Merge "Fix libffi issues with dynamic linking (now with mac support)" am: 272...Treehugger Robot2020-08-064-4/+16
| |\| | | | | | | | |
| | * | | | | | | | | Merge "Fix libffi issues with dynamic linking (now with mac support)"Treehugger Robot2020-08-064-4/+16
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Fix libffi issues with dynamic linking (now with mac support)Stephen Hines2020-08-064-4/+16
| | |/ / / / / / / / /
| * | | | | | | | | | Merge "Revert "Fix libffi issues with dynamic linking"" am: 411cc2867eInsaf Latypov2020-08-064-4/+4
| |\| | | | | | | | |
| | * | | | | | | | | Merge "Revert "Fix libffi issues with dynamic linking""Insaf Latypov2020-08-064-4/+4
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Revert "Fix libffi issues with dynamic linking"Insaf Latypov2020-08-064-4/+4
| * | | | | | | | | | | Merge "Fix libffi issues with dynamic linking" am: 755030697fTreehugger Robot2020-08-064-4/+4
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "Fix libffi issues with dynamic linking"Treehugger Robot2020-08-064-4/+4
| | |\| | | | | | | | |
| | | * | | | | | | | | Fix libffi issues with dynamic linkingStephen Hines2020-08-054-4/+4
| | |/ / / / / / / / /
| * | | | | | | | | | Merge "Remove unnecessary win32.S source file." am: 56b44d2c90Treehugger Robot2020-08-052-1352/+0
| |\| | | | | | | | |
| | * | | | | | | | | Merge "Remove unnecessary win32.S source file."Treehugger Robot2020-08-052-1352/+0
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Remove unnecessary win32.S source file.Stephen Hines2020-08-052-1352/+0
| | |/ / / / / / / / /
| * | | | | | | | | | Merge "Revert "Support building as shared library and remove win32.S"" am: 12...Chiachang Wang2020-08-052-1/+1353
| |\| | | | | | | | |
| | * | | | | | | | | Merge "Revert "Support building as shared library and remove win32.S""Chiachang Wang2020-08-052-1/+1353
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Revert "Support building as shared library and remove win32.S"Stephen Hines2020-08-052-1/+1353
| * | | | | | | | | | | Merge "Support building as shared library and remove win32.S" am: 8802df7a47Treehugger Robot2020-08-052-1353/+1
| |\| | | | | | | | | | | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| | * | | | | | | | | Merge "Support building as shared library and remove win32.S"Treehugger Robot2020-08-052-1353/+1
| |/| | | | | | | | | | | |/ / / / / / / /
| | * / / / / / / / Support building as shared library and remove win32.SStephen Hines2020-08-042-1353/+1
| |/ / / / / / / /
* | | | | | | | | Merge "Snap for 6577974 from 004e55c74517edc7db707429390d2d07a5df4bb4 to simp...android-build-prod (mdb)2020-06-100-0/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Snap for 6577974 from 004e55c74517edc7db707429390d2d07a5df4bb4 to simpleperf-...android-build-prod (mdb)2020-06-100-0/+0
|/| | | | | | | | | | |/ / / / / / / /
| * | | | | | | | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterandroid-r-beta-3android-r-beta-2Xin Li2020-04-090-0/+0
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | * | | | | | | Merge "Fix mac builds" am: 48ed0ceaa5 am: e1cbcb84b6Treehugger Robot2020-04-013-869/+0
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge "Fix mac builds" am: 48ed0ceaa5Treehugger Robot2020-04-013-869/+0
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | | * | | | | | Merge "Upgrade to upstream v3.3 and add METADATA." am: 14258db31a am: d04714f814Treehugger Robot2020-03-30310-8351/+46359
| | | |\ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge "Upgrade to upstream v3.3 and add METADATA." am: 14258db31aTreehugger Robot2020-03-30310-8351/+46359
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | | | * | | | | Merge "Remove redundant NOTICE copied from LICENSE." am: 1246a03894 am: b8074...Treehugger Robot2020-03-261-21/+0
| | | | |\ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | / | | | | | |_|_|/ | | | | |/| | |
| * | | | | | | Merge "Remove redundant NOTICE copied from LICENSE." am: 1246a03894Treehugger Robot2020-03-261-21/+0
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge "Snap for 6355748 from 48ed0ceaa52de017f739f014f03d4035fd48638f to simp...android-build-prod (mdb)2020-04-01312-9220/+46359
|\ \ \ \ \ \ \ \
| * | | | | | | | Snap for 6355748 from 48ed0ceaa52de017f739f014f03d4035fd48638f to simpleperf-...android-build-prod (mdb)2020-04-01312-9220/+46359
|/| | | | | | | | | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge "Fix mac builds"Treehugger Robot2020-04-013-869/+0
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | Fix mac buildsDan Willemsen2020-03-313-869/+0
| |/ / / / / /
| * | | | | | Merge "Upgrade to upstream v3.3 and add METADATA."Treehugger Robot2020-03-30310-8351/+46359
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Upgrade to upstream v3.3 and add METADATA.Elliott Hughes2020-03-30310-8351/+46359
| |/| | | | |
| | * | | | | Move nested_struct3 test to closures directoryAnthony Green2019-11-232-1/+1
| | * | | | | Add missing closing braceAnthony Green2019-11-231-0/+1