summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: f8c1e67cfc -s ours am skip reason: subject contains skip directive Change-Id: Ia459497d500f37c0fe478d32e6a3a1721185c942
2020-03-18DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I14c707de58187b91d789da526a3cae34d79fead7
2020-03-12Merge "Remove mips workarounds." am: f44921e7d4 am: 8884577c0d am: ↵Automerger Merge Worker
253781fa7a am: 0a4770e7ea am: 2d9d2982db Change-Id: Ic4c2693155587d48a32a38cd1f8ef56439ee5c47
2020-03-12Merge "Remove mips workarounds." am: f44921e7d4 am: 8884577c0d am: ↵Automerger Merge Worker
253781fa7a am: 0a4770e7ea Change-Id: I228ec1cf3040b0c5089b69dd1f7e936de3b68e2b
2020-03-12Merge "Remove mips workarounds." am: f44921e7d4 am: 8884577c0d am: 253781fa7aAutomerger Merge Worker
Change-Id: I04bb4cbd6c60c214ac7b01c573dd26b34d7d4fe7
2020-03-12Merge "Remove mips workarounds." am: f44921e7d4 am: 8884577c0dAutomerger Merge Worker
Change-Id: I8696e0213cf23bb36bbe7b4f224ad72ac98cadd7
2020-03-12Merge "Remove mips workarounds." am: f44921e7d4 am: 8884577c0dAutomerger Merge Worker
Change-Id: Ic8fe8b15cf9b109df3967a9d833b59864322d406
2020-03-12Merge "Remove mips workarounds." am: f44921e7d4Automerger Merge Worker
Change-Id: I72c7517ca00a859c62f0f1119847bc321bd22936
2020-03-12Merge "Remove mips workarounds."android-r-preview-4android-r-preview-3android-r-preview-2Treehugger Robot
2020-03-07Remove mips workarounds.Elliott Hughes
Test: treehugger Change-Id: If84b54fc6cfac187e8dd8653bdf025dd7bb6f61a
2020-01-31Merge "Enable 64-bit linking on arm" am: b651c29d26 am: 4a0a4760bb am: ↵r_aml_301500702android-mainline-12.0.0_r55android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseAutomerger Merge Worker
3adc56133b Change-Id: Iccfd0a635cf7e2c59c0e971f3dd6e4399dd51e52
2020-01-31Merge "Enable 64-bit linking on arm" am: b651c29d26 am: 4a0a4760bbAutomerger Merge Worker
Change-Id: Iaa238bebf73081571574f8e43210e478cc977010
2020-01-31Merge "Enable 64-bit linking on arm" am: b651c29d26Automerger Merge Worker
Change-Id: I6799b6d1abe3aa92358ddd19c03bf969ff85938a
2020-01-31Merge "Enable 64-bit linking on arm"android-r-preview-1Miao Wang
2020-01-30Enable 64-bit linking on armMiao Wang
Bug: 138266211 Test: mm Test: 64bit RS app compiles well with 32bit bcc Change-Id: Ie94035780355b85d4959bbf4909ddac3db51b17c
2020-01-16[automerger skipped] DO NOT MERGE - Empty merge ↵Automerger Merge Worker
qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: 3943f5d657 am: d4442cc6a3 -s ours am skip reason: subject contains skip directive Change-Id: I508dc5b2298261ae5ec7241993d5e5aa286bbe69
2020-01-16DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) ↵Automerger Merge Worker
into stage-aosp-master am: 3943f5d657 Change-Id: I3c25f0a0d3dcfa134ed7b8e6357b175648a541f1
2020-01-15DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) ↵Xin Li
into stage-aosp-master Bug: 146167222 Change-Id: Ia1756a4c8cd90ec0cbc81cc3d70b0f290c735c11
2020-01-13Merge "Updates for bison 3.5" am: e262086a37 am: 55bdf75af8 am: 3e9aa818e9Automerger Merge Worker
Change-Id: Id286c8a584f001a57ae942229b8b218e0203df86
2020-01-13Merge "Updates for bison 3.5" am: e262086a37 am: 55bdf75af8Automerger Merge Worker
Change-Id: Ic1ada8bd6b96e456a657ad2e2a3d9a88dd97bbab
2020-01-13Merge "Updates for bison 3.5"Dan Willemsen
am: e262086a37 Change-Id: I9750e19a1b125065834b062cb66927ff5ebe0694
2020-01-13Merge "Updates for bison 3.5"Treehugger Robot
2020-01-11Updates for bison 3.5Dan Willemsen
Bug: 31194194 Test: build Change-Id: Idde1ce1ac41357549233d3d91be1dbd0760034fc
2019-12-26Merge "Stop copying FlexLexer.h; use the one from flex" am: 1257ff666c am: ↵Automerger Merge Worker
60e39bd5fb am: 29a555a337 Change-Id: I95fee571e1d8f0ed9dc27328739b7d0987556ebc
2019-12-26Merge "Stop copying FlexLexer.h; use the one from flex" am: 1257ff666c am: ↵Automerger Merge Worker
60e39bd5fb Change-Id: I98d21f7a809af805918468c4bf72d7ffeebaa29d
2019-12-26Merge "Stop copying FlexLexer.h; use the one from flex"Dan Willemsen
am: 1257ff666c Change-Id: I1bbfa9b7929de25903a5a74559b088f04ea80eb5
2019-12-26Merge "Stop copying FlexLexer.h; use the one from flex"Treehugger Robot
2019-12-26Stop copying FlexLexer.h; use the one from flexDan Willemsen
Fixes: 80546248 Test: treehugger Change-Id: I0f3064989c76f8a2b2cf877f46905f174319a426
2019-04-15Merge "Mark these yacc files as creating headers" am: 8e31655a04 am: 52ad108a93Dan Willemsen
am: 36166637d4 Change-Id: I95e0b5c8a23d2a00d14844e74c14778adbcd567c
2019-04-15Merge "Mark these yacc files as creating headers" am: 8e31655a04android-mainline-10.0.0_r8android-mainline-10.0.0_r6ndk-sysroot-r21android10-mainline-resolv-releaseandroid10-mainline-networking-releaseDan Willemsen
am: 52ad108a93 Change-Id: I9cb0bb34459815ebe3499acb7b5165b4f9ad41a3
2019-04-15Merge "Mark these yacc files as creating headers"android-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Dan Willemsen
am: 8e31655a04 Change-Id: I8b92d44a4ad252444e0d9b6c9cc9545cf56db40b
2019-04-16Merge "Mark these yacc files as creating headers"android-o-mr1-iot-release-1.0.12oreo-mr1-iot-releaseTreehugger Robot
2019-04-12Mark these yacc files as creating headersDan Willemsen
So that they're properly represented in the build graph. Test: treehugger Change-Id: Ia9b8caf0b63731b863862d30331c5c72fa398dd7
2019-02-24[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-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_r12android10-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-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseXin Li
am: 757b727828 -s ours am skip reason: subject contains skip directive Change-Id: I3ed54eb35718864cf5d6082bf7a0685f11bea14e
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: I1a2039697fe5d1bebd5e93d5cebaf074a290759d
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 9e649433ae -s ours am: 36e628402a -s ours am: 91492e1ab1 -s ours Change-Id: I0c3fcec0df39a7196c34178cb39d0cb13061c062
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 9e649433ae -s ours am: 36e628402a -s ours Change-Id: I613c878602b406b26321cdd2f845090a4bf222b7
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
am: 9e649433ae -s ours Change-Id: I591c043fe659d03d7b19d3ad39524a31a61b37e7
2018-10-24Merge pie-platform-release to aosp-master - DO NOT MERGEandroid-wear-8.0.0_r2android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-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-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7android-o-mr1-iot-release-1.0.10android-n-iot-release-ihome-igv1nougat-iot-releaseBill Yi
Change-Id: I4a357ce1e337d15b7bd684b7c0a204381f448af3
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: e9dd012728 -s ours am: 7fb51e8b06 -s ours Change-Id: I79ba1ac7886031a6a4d59f4462624f130e8566d6
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: e9dd012728 -s ours Change-Id: I7f37fb95c36b48d22cb68f89cb5d87f6f487ce63
2018-10-24Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi
Change-Id: Ic87d461acbdc4b8fd62680a3e4b5857496a3af7f
2018-06-04Merge "Update FlexLinker.h to current version of flex." am: 887e2d99a5 am: ↵Steven Moreland
389e648f59 am: 309a19c703 Change-Id: Ie1eafebb4911f7415387ff165613240af4120daa
2018-06-04Merge "Update FlexLinker.h to current version of flex." am: 887e2d99a5android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseSteven Moreland
am: 389e648f59 Change-Id: Ic05f622353ddec484af367576df45a5e94a280a3
2018-06-04Merge "Update FlexLinker.h to current version of flex."Steven Moreland
am: 887e2d99a5 Change-Id: Idcedd4eead030a6a73d29ac02374419cbd511ed0
2018-06-04Merge "Update FlexLinker.h to current version of flex."android-p-preview-5android-p-preview-4android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1Steven Moreland
2018-06-04Update FlexLinker.h to current version of flex.Steven Moreland
This file is copied here and has become out of sync w/ flex. Bug: 31194194 Test: build and boot device Test: atest CtsRenderscriptTestCases Total Tests : 744 PASSED : 744 FAILED : 0 Test: atest CtsRenderscriptTestCases -it -- --abi=armeabi-v7a Total Tests : 744 PASSED : 744 FAILED : 0 Change-Id: Ib8102727724d87725992c97abc29ab9e06ec4ee1
2018-04-24Merge "Remove former members from OWNERS." am: b8036c7ba0 am: 0847e08068Stephen Hines
am: 3b03c424b5 Change-Id: Id117c5143274c97d8aaad2229130a2a67063e3f1
2018-04-24Merge "Remove former members from OWNERS." am: b8036c7ba0Stephen Hines
am: 0847e08068 Change-Id: Ia3b829057fc6f2ab4d626dd84d5a6ed4e7da7104
2018-04-24Merge "Remove former members from OWNERS."Stephen Hines
am: b8036c7ba0 Change-Id: I3534b03ff0f65abcb5e942265ccb783511364ae9
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 01:35:11 +0000