aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-02-26Snap for 5335706 from 7295712444f9e66fd0f52a298c1c39ccb0194ad4 to qt-releaseandroid-vts-10.0_r9android-vts-10.0_r8android-vts-10.0_r7android-vts-10.0_r6android-vts-10.0_r5android-vts-10.0_r4android-vts-10.0_r3android-vts-10.0_r2android-vts-10.0_r16android-vts-10.0_r15android-vts-10.0_r14android-vts-10.0_r13android-vts-10.0_r12android-vts-10.0_r11android-vts-10.0_r10android-vts-10.0_r1android-security-10.0.0_r75android-security-10.0.0_r74android-security-10.0.0_r73android-security-10.0.0_r72android-security-10.0.0_r71android-security-10.0.0_r70android-security-10.0.0_r69android-security-10.0.0_r68android-security-10.0.0_r67android-security-10.0.0_r66android-security-10.0.0_r65android-security-10.0.0_r64android-security-10.0.0_r63android-security-10.0.0_r62android-security-10.0.0_r61android-security-10.0.0_r60android-security-10.0.0_r59android-security-10.0.0_r58android-security-10.0.0_r57android-security-10.0.0_r56android-security-10.0.0_r55android-security-10.0.0_r54android-security-10.0.0_r53android-security-10.0.0_r52android-security-10.0.0_r51android-security-10.0.0_r50android-security-10.0.0_r49android-security-10.0.0_r48android-mainline-10.0.0_r3android-mainline-10.0.0_r2android-mainline-10.0.0_r1android-cts-10.0_r9android-cts-10.0_r8android-cts-10.0_r7android-cts-10.0_r6android-cts-10.0_r5android-cts-10.0_r4android-cts-10.0_r3android-cts-10.0_r2android-cts-10.0_r16android-cts-10.0_r15android-cts-10.0_r14android-cts-10.0_r13android-cts-10.0_r12android-cts-10.0_r11android-cts-10.0_r10android-cts-10.0_r1android-10.0.0_r6android-10.0.0_r5android-10.0.0_r47android-10.0.0_r46android-10.0.0_r4android-10.0.0_r3android-10.0.0_r2android-10.0.0_r17android-10.0.0_r11android-10.0.0_r10android-10.0.0_r1android10-tests-releaseandroid10-security-releaseandroid10-s3-releaseandroid10-s2-releaseandroid10-s1-releaseandroid10-releaseandroid10-mainline-releaseandroid10-mainline-a-releaseandroid10-gsiandroid-build-team Robot
Change-Id: I3bea90c09130eba29bef8451f586edc2a5163f5a
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospq_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-10.0.0_r9android-mainline-10.0.0_r8android-mainline-10.0.0_r7android-mainline-10.0.0_r6android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12q_tzdata_aml_297100000android12-mainline-tzdata-releaseandroid10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-tzdata-releaseandroid10-mainline-resolv-releaseandroid10-mainline-networking-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseandroid10-android13-mainline-tzdata-releaseXin Li
am: e9f4007902 Change-Id: I49ddf66b84bf9c9357af97e2871cc90f9bc98cd1
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: Ie6b31bb97a9fb0603420f405a8bf73185362aba0
2019-02-21Snap for 5325928 from 33d3335839cae83b141d15b3d3af89ce16084cad to qt-releaseandroid-build-team Robot
Change-Id: Ie1904c7b432eef844eca94d1a60cd710c539cb31
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Xin Li
Bug: 120848293 Change-Id: I4b14727a88dab59e88a62b5cec751e47a3e84637
2019-02-20[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master am: ↵Xin Li
eb1899ca38 -s ours am: 6ed5f16c01 -s ours am: 77c95915db -s ours am skip reason: subject contains skip directive Change-Id: I1a2f3cc28c3cf327ac45d6bca710a451e92b1d8a
2019-02-20[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master am: ↵Xin Li
eb1899ca38 -s ours am: 6ed5f16c01 -s ours am skip reason: subject contains skip directive Change-Id: I4af7d95f11a2e10e3aced7618ead7fc02592d669
2019-02-20[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into masterXin Li
am: eb1899ca38 -s ours am skip reason: subject contains skip directive Change-Id: I6da052415dfc2a3f6d2d32ecb6b1c2ce8d2cba88
2019-02-18DO 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 Li
Bug: 124234733 Change-Id: I04ff050624b5649a0e840fdc63e531db52240d55
2019-02-17Snap for 5316819 from 8663667d9d0fcda535f3b985d3e587baba706e50 to qt-releaseandroid-build-team Robot
Change-Id: I247293558d637b51ddce1690c727c55ff16470a6
2019-02-14[automerger skipped] DO NOT MERGE - Merge pi-platform-release ↵Xin Li
(PPRL.190205.001) into stage-aosp-master am: 0d3a7a2a60 -s ours am: 0490b48033 -s ours am skip reason: subject contains skip directive Change-Id: Ic590990d76d61e8008dd247bedc100257c028e56
2019-02-14[automerger skipped] DO NOT MERGE - Merge pi-platform-release ↵Xin Li
(PPRL.190205.001) into stage-aosp-master am: 0d3a7a2a60 -s ours am skip reason: subject contains skip directive Change-Id: I36be8ef2695e6300b5c4296874be60c6620667ee
2019-02-12DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into ↵temp-124234733-masterXin Li
stage-aosp-master Bug: 124234733 Change-Id: I55002b1b7a9c53afc4dcefafcbcb585578a493a2
2019-02-09Snap for 5180536 from 2a49513da00436f434281a98dfb118db855db013 to ↵pie-platform-releaseandroid-build-team Robot
pi-platform-release Change-Id: I32c1ba70e0bff663fdd5f10151354ef9ec64fd49
2019-01-23Snap for 5251505 from 4f157d89375d6b6ca5859637bc55d88f3519b629 to qt-releaseandroid-build-team Robot
Change-Id: Ib6f535787fe843aa73c4d72ffc889ba932c21a83
2019-01-22Merge remote-tracking branch 'aosp/upstream' am: 6cccb8fde7 am: bd05e6980bDan Willemsen
am: c8b9a208eb Change-Id: I14eed78b1df7a1370f4cc36c4a45272cfabef0d6
2019-01-22Merge remote-tracking branch 'aosp/upstream' am: 6cccb8fde7Dan Willemsen
am: bd05e6980b Change-Id: I98c544018dd371959e47470c4f4f17d79f72f24d
2019-01-22Merge remote-tracking branch 'aosp/upstream'Dan Willemsen
am: 6cccb8fde7 Change-Id: I3713a4244b8057dcfb747611b917d95112b2d298
2019-01-22Merge remote-tracking branch 'aosp/upstream'Dan Willemsen
* aosp/upstream: Add --top_level_phony Change-Id: I6ea01a4e9c802c07d20234ef3ef1762b66f8fe3d
2019-01-22Merge pull request #164 from danw/top_level_phonyDan Willemsen
Add --top_level_phony
2019-01-21Add --top_level_phonyDan Willemsen
This makes the real_to_phony checks assume that any leaf dependencies that doesn't have a '/' in it is a PHONY target. We need this in Android since we now have two separate Kati instances both writing out ninja files from Makefiles. Without this, the real_to_phony checks don't work when the PHONY target is defined in the other Kati instance. Change-Id: Ib0aeee8e57e47b37adef1f5bed871f909cc4af9d
2019-01-13Snap for 5228332 from 366709b3eaf631db3458780fca599b37776d5c78 to qt-releaseandroid-build-team Robot
Change-Id: Iaca56a97b1703b488705f01b15d12e66d4058a94
2019-01-11Merge remote-tracking branch 'aosp/upstream' into update am: 6a94855578 am: ↵Dan Willemsen
98e7c403c9 am: c44ea02967 Change-Id: I2a9126c9c6249720c643a0ba9a3cc28418096366
2019-01-11Merge remote-tracking branch 'aosp/upstream' into update am: 6a94855578Dan Willemsen
am: 98e7c403c9 Change-Id: Ie4efef8838aff795c07fae6d2416532200773785
2019-01-11Merge remote-tracking branch 'aosp/upstream' into updateDan Willemsen
am: 6a94855578 Change-Id: I3e189375d2f68817aad2757ccd796cc577f49f5a
2019-01-11Merge remote-tracking branch 'aosp/upstream' into updateDan Willemsen
* aosp/upstream: Use std::random_device instead of initializing via getpid Fix undeclared identifier 'exit' on Mac. Fix segfault when reporting implicit outputs error Update travis config; require clang-format to pass Run clang-format Bug: 122270019 Test: upstream Test: aosp-build-tools forrest build Change-Id: I8639b4c04fe0bf0ea64fb1b801f2e25c69c913e1
2019-01-11Merge pull request #163 from danw/random_affinityDan Willemsen
Use std::random_device instead of initializing via getpid
2019-01-11Use std::random_device instead of initializing via getpidDan Willemsen
getpid worked fine for this until we started trying to run Kati within a pid namespace (via nsjail). Then it consistently got the same pid, which resulted in multiple copies of Kati all running on the same CPU. Change-Id: If50846f742c3898ca92e21e0d2c78ad8e34d0128
2018-12-11Snap for 5174203 from 446c30c7d18fbe9b6288ac6cecce292cc4e1f8ce to qt-releaseandroid-build-team Robot
Change-Id: I35f26e6f8ae99da13bf18da87a9eb895df2a7f48
2018-12-10[automerger skipped] DO NOT MERGE am: 679d6bb847 -s ours am: d5f699af92 -s ↵Xin Li
ours am: e7b9330b75 -s ours Change-Id: I7b2cde67c3518d061baf39f724d634855234c44b
2018-12-10[automerger skipped] DO NOT MERGE am: 679d6bb847 -s oursXin Li
am: d5f699af92 -s ours Change-Id: Ice1060d4f5bf8ce0d57913b263a5db5bcdde3852
2018-12-10[automerger skipped] DO NOT MERGEXin Li
am: 679d6bb847 -s ours Change-Id: If62fd6f02e77ef228d17511b1920b0aadfff40e5
2018-12-07DO NOT MERGEandroid-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7Xin Li
Merge pie-platform-release (PPRL.181205.001, history only) into master Bug: 120502534 Change-Id: I45c2b2f5b9df9e91a3f09e34f6f6de2028134191
2018-12-05Merge pull request #162 from Martin-Hsu/masterDan Willemsen
Fix undeclared identifier 'exit' on Mac.
2018-12-06Fix undeclared identifier 'exit' on Mac.Martin Hsu
Fix undeclared identifier 'exit' on Mac.
2018-11-12Merge pull request #161 from colincross/implicit_outputs_segfaultcolincross
Fix segfault when reporting implicit outputs error
2018-11-12Fix segfault when reporting implicit outputs errorColin Cross
The format expected the LOCF macro to convert a Loc object to %s:%d, but was getting just the Loc object. Change-Id: I64005aa0b23fe1f70292a3da543799c51fbdcdc9
2018-11-05Merge pull request #160 from danw/clang-formatDan Willemsen
Run clang-format, then enforce it via Travis
2018-11-05Update travis config; require clang-format to passDan Willemsen
2018-11-05Run clang-formatDan Willemsen
2018-11-01Snap for 5103990 from 4548c1bfbfa37b03018b74d7a417e895ee75a023 to qt-releaseandroid-build-team Robot
Change-Id: Ic5a9e814e9b4b19d07b57ca57fde1afaa13f5ef1
2018-10-31Merge remote-tracking branch 'aosp/upstream' am: 667d0786cf am: f6037b3fd7Dan Willemsen
am: 16a0f0bb70 Change-Id: Icf22605c365f0fcb51ad8aac62be4c689505b90a
2018-10-31Merge remote-tracking branch 'aosp/upstream' am: 667d0786cfDan Willemsen
am: f6037b3fd7 Change-Id: Ieaefbefb48dd0ea6f1bc310c2ed53d2ff7d52bc3
2018-10-31Merge remote-tracking branch 'aosp/upstream'Dan Willemsen
am: 667d0786cf Change-Id: I8c9c756152a5a9240b9487582d11879577858552
2018-10-30Merge remote-tracking branch 'aosp/upstream'android-wear-8.0.0_r2android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-n-iot-release-ihome-igv1nougat-iot-releaseDan Willemsen
* aosp/upstream: Improve regen performance by setting cpu affinity Test: m nothing (with new ckati prebuilt) Change-Id: I90eee540ad65b330d2d3f833e1bc7dc775102fff
2018-10-30Merge pull request #156 from danw/regen_affinityDan Willemsen
Improve regen performance by setting cpu affinity
2018-10-30Improve regen performance by setting cpu affinityDan Willemsen
For aosp/master aosp_arm64-eng, this brings the times for regen down by nearly a second: glob time (regen) 0.52 -> 0.52 shell time (regen) 2.25 -> 1.39 stat time (regen) 0.54 -> 0.44 Some of our internal targets show larger decreases: glob time (regen) 0.81 -> 0.83 shell time (regen) 4.84 -> 2.99 stat time (regen) 1.11 -> 0.95 Change-Id: I2c52de0643a3a424e9866017cc53dde4a24a40ec
2018-10-28Snap for 5096429 from d04dac8fd23317453e9f8d8833be9f04a419df88 to qt-releaseandroid-build-team Robot
Change-Id: Ief6afb75bc1a5b0df366674ebee5c0f96f308646
2018-10-26Merge remote-tracking branch 'aosp/upstream' am: 2de6712ec4 am: e3a8287fe6Dan Willemsen
am: 1ca31fa43d Change-Id: I2f2e3491e1e45eadb7feb68155260ab062a326dc
2018-10-26Merge remote-tracking branch 'aosp/upstream' am: 2de6712ec4Dan Willemsen
am: e3a8287fe6 Change-Id: I8d43b70d9393f737d472285d4e11d98df50014bc
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 21:37:46 +0000