aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospandroid-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: 1d1e072d57 Change-Id: I5c01daae7b6c6e5a54f0ed5a0bf861f7985634b9
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: I4d0b303d4e693a59ce22c2dea1fb43f2e1176325
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: I99d731f186018370947140681a868e55b3c553ca
2019-01-31Explicitly include log/log.h instead of cutils/log.h am: 2e57a3019b am: ↵Sasha Smundak
df18e50fe8 am: 2ea4932e4f Change-Id: I2a4e6bff6766e0c9bd4ab5b9eb40ad6773281b60
2019-01-31Explicitly include log/log.h instead of cutils/log.h am: 2e57a3019bSasha Smundak
am: df18e50fe8 Change-Id: I692dded53210da064277704d7c52bbc395d19834
2019-01-31Explicitly include log/log.h instead of cutils/log.hSasha Smundak
am: 2e57a3019b Change-Id: I5a52235edcbe8ff6ff4ae816153b019d34bf7c54
2019-01-31Explicitly include log/log.h instead of cutils/log.handroid-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-releaseSasha Smundak
Eliminates the warning. Test: treehugger Change-Id: I0652dd3b55ce881eb5bbb0561a768448a1e661ed
2018-12-10[automerger skipped] DO NOT MERGE am: 1bcb0ea0e0 -s ours am: 93e65daee9 -s ↵Xin Li
ours am: 16c81d194a -s ours Change-Id: I787e1c333b02d22520aebd4fb7f62a3a03ba1647
2018-12-10[automerger skipped] DO NOT MERGE am: 1bcb0ea0e0 -s oursXin Li
am: 93e65daee9 -s ours Change-Id: I5367334078d9656cb9d5871d3095a50317a0d501
2018-12-10[automerger skipped] DO NOT MERGEXin Li
am: 1bcb0ea0e0 -s ours Change-Id: I69de7c0e5afd8bccdc46c32b39b142327b68e66c
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: I28c7e3b3d7f6ae826e2af4925510dcee0afa7a28
2018-08-08Merge Android Pie into master am: 86c8915169 am: 8b8636cba6 am: 5f3cf91de4Xin Li
am: fe619e6fef Change-Id: Ia533396039cd5b16bdfff85dba3a45e834555cee
2018-08-07Merge Android Pie into master am: 86c8915169 am: 8b8636cba6Xin Li
am: 5f3cf91de4 Change-Id: Ic927b11656bb8173db4899fe24fbd3a4524e0ebf
2018-08-07Merge Android Pie into master am: 86c8915169android-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-fcsXin Li
am: 8b8636cba6 Change-Id: If062dabe67c69184c8e0cb88209c6ba79bada47f
2018-08-07Merge Android Pie into masterXin Li
am: 86c8915169 Change-Id: Ie82039de6d14f5d66906ef2ad3954f3d158d81aa
2018-08-06Merge Android Pie into masterandroid-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-releaseXin Li
Bug: 112104996 Change-Id: I4f9a954ed98dcc3649e416835ac9b3dacbaca46c
2018-06-09Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: ee355a6599Xin Li
am: b86eecd715 Change-Id: I3ffdafcf24fb4c4c0104ad6e1b82cabd0aa41eb9
2018-06-09Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li
am: ee355a6599 Change-Id: Ibce5e72adb7e07459d1053ae79e48900c55c20ac
2018-06-08Merge pi-dev-plus-aosp-without-vendor into stage-aosp-mastertemp_p_mergeXin Li
Bug: 79597307 Change-Id: I3d371072ead160d735cd7cb5f688e5d3993e7386
2018-03-05Snap for 4633189 from f314bba6e9665c4789000447ee5d668f5481e99c to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-releaseandroid-build-team Robot
Change-Id: Ib57b76ba799d72c89f5904ba9035613461ab589e
2018-03-05Reformat Android.bp file am: 773135272c am: b4890d76efandroid-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devLogan Chien
am: a543696112 Change-Id: I2aac3efa8f897c923fabe8631822a3f7ed83f04c
2018-03-05Reformat Android.bp file am: 773135272cLogan Chien
am: b4890d76ef Change-Id: I95f08fb215e7a589496b69e9046457ad6bef1618
2018-03-05Reformat Android.bp fileLogan Chien
am: 773135272c Change-Id: I3aa4b7f7e1aa40e34879ee7414353dc9a18dcd95
2018-02-27Reformat Android.bp fileandroid-wear-p-preview-2android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7o-mr1-iot-preview-8o-mr1-iot-preview-7Logan Chien
This commit replaces `=` with `:`, which is more idiomatic. Test: aosp_sailfish-userdebug builds Change-Id: Iafd87cb0a4b98083531a7fa3155ec23f7ca5360d
2018-01-09Snap for 4533842 from 154ca5c8cbac93d717237ea421e1549d0b70b86f to pi-releaseandroid-build-team Robot
Change-Id: Ib274ea9e79a63c66eca4981579b1acf921379ba9
2018-01-08Ignore -Wformat warning am: 0423b367f5 am: 3bdbe4bdc5Yi Kong
am: eced8d1805 Change-Id: If7aaeac03ebef0fbd4ef53f67498b1358c7602a8
2018-01-08Ignore -Wformat warning am: 0423b367f5Yi Kong
am: 3bdbe4bdc5 Change-Id: I77ff773f2a43983216bffd495e1f11201bb1a56b
2018-01-08Ignore -Wformat warningYi Kong
am: 0423b367f5 Change-Id: I78a0cc7b34e53c962fc4271c681dac236a59fd23
2018-01-03Ignore -Wformat warningandroid-wear-8.0.0_r1Yi Kong
Clang 6.0.1 update introduced a number of new warnings, failing werror build. Ignore the -Wformat warning for external/libese. Test: m checkbuild Change-Id: Ie82a0cc86a49682c9189d0af8b86008d88a32f54
2017-12-17Snap for 4507345 from f50d711795a541515fd01b10529a2bfe5701cae9 to pi-releaseandroid-build-team Robot
Change-Id: Id6b0db337d29be4f61f711e5a20a6b32aa223042
2017-12-15Merge cherrypicks of [3373038, 3372799] into pi-releaseandroid-build-team Robot
Change-Id: I7868a88c73095b37de6ef4e83aa41aa247091e01
2017-12-15Fix compiler warning.Chih-Hung Hsieh
Test: build aosp_taimen-userdebug with SANITIZE_TARGET=address Change-Id: If0a9e083e45d86c132f34b14df52994cdd8b4438 (cherry picked from commit df52de7a3abafbcc7dc126e6ff6f7edc92f44a24)
2017-12-15Fix compiler warning. am: df52de7a3a am: 12cad722ecChih-Hung Hsieh
am: 393ef9ddac Change-Id: Ibb30f5ee1fbbc6fd54fd233a2637c8d06914b3af
2017-12-15Fix compiler warning. am: df52de7a3aChih-Hung Hsieh
am: 12cad722ec Change-Id: I4544eb2aac8e83fdf3cd3ab7ee6b6ee4d8c24f3a
2017-12-15Fix compiler warning.Chih-Hung Hsieh
am: df52de7a3a Change-Id: Id5b6a2314c768ede94ca3d70982ea46ce2136e5d
2017-12-14Fix compiler warning.Chih-Hung Hsieh
Test: build aosp_taimen-userdebug with SANITIZE_TARGET=address Change-Id: If0a9e083e45d86c132f34b14df52994cdd8b4438
2017-12-11Snap for 4496165 from 92cbe3cd0e47771f0fc8e3349ca87a9aa172bb25 to pi-releaseandroid-build-team Robot
Change-Id: I02b15eb5e1eb3efd29f10b90c3767d0d4abd56e2
2017-12-07Manually merge changes from giant AOSP topicStephen Li
Change-Id: I855d9d0941c8d2bf9292590dda975b3ee2d3b71b
2017-12-07DO NOT MERGE: Merge Oreo MR1 into master am: ece867c88c -s oursXin Li
am: ad706dcdb1 Change-Id: I6c65f29b17ce1bf0f4874d9aee21ad0b1b5f5d69
2017-12-07DO NOT MERGE: Merge Oreo MR1 into masterXin Li
am: ece867c88c -s ours Change-Id: I7c175a5667aec3d3d9bab5b0fb29769caa249f85
2017-12-06DO NOT MERGE: Merge Oreo MR1 into masterXin Li
Exempt-From-Owner-Approval: Changes already landed internally Change-Id: I143cfb6a0bf67660e9c875bc3231911812beeec8
2017-11-08Snap for 4439972 from 0b88db497d350e4930343e80ea205c249a2981f4 to pi-releaseandroid-build-team Robot
Change-Id: Ibd2eaef5006f80b4ecedf2bdcba39ce0963e38dc
2017-11-07Merge commit '6e6df26ed3086f6e208abfcd2bba5242f67ac78a' from ↵Xin Li
oc-mr1-dev-plus-aosp into stage-aosp-master. am: 83bf281120 am: 2578a5ce69 Change-Id: I8b27b9cd21fa86d44bfe70fb4df8fa8c91e2a3b7
2017-11-07Merge commit '6e6df26ed3086f6e208abfcd2bba5242f67ac78a' from ↵Xin Li
oc-mr1-dev-plus-aosp into stage-aosp-master. am: 83bf281120 Change-Id: I7ede7bb8da2996df1edd9cb45b178af024c8ceb4
2017-11-02Merge commit '6e6df26ed3086f6e208abfcd2bba5242f67ac78a' fromXin Li
oc-mr1-dev-plus-aosp into stage-aosp-master. Change-Id: I0b96594cecf686a414b98abf6e958fa8783a6485
2017-11-01Snap for 4428213 from 0f82b371498995d24aa4cf8c577e6535b81ddd7a to pi-releaseandroid-build-team Robot
Change-Id: I645d29411765dcf87ddf83a6781d164468f5b7e2
2017-10-31Use -Werror in external/libese/esed/tests am: ef2187d212 am: 6d0479f57b -s oursChih-Hung Hsieh
am: 14735f2349 -s ours Change-Id: Ic9ad9a917112e36ba4026ceb430cbae0c52b31d6
2017-10-31Use -Werror in external/libese/esed/tests am: ef2187d212Chih-Hung Hsieh
am: 6d0479f57b -s ours Change-Id: I35385db4c627ffc1d282a87ba37646821cfbd862
2017-10-31Use -Werror in external/libese/esed/testsChih-Hung Hsieh
am: ef2187d212 Change-Id: Ie9951ad7faac4677e4c032dfadd410218ff5c455
2017-10-25Use -Werror in external/libese/esed/testsandroid-o-mr1-iot-preview-6o-mr1-iot-preview-6Chih-Hung Hsieh
Bug: 66996870 Test: build with WITH_TIDY=1 Merged-In: If00e379f9803713ae7674ce487f0076bf7462eee Change-Id: Ic679f2524c33970684fda65d7604cc7b8a23e28f
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-13 23:12:47 +0000