aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-r-preview-1android-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_297100000ndk-sysroot-r21android12-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: 1e28d6a1f2 Change-Id: I2ee63c5e7dc8ffa788af390d4622af9c191c351c
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: Ie271de2f3b5a59d7f8d785fe685f31a527f38971
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: I2ec2592c9135b771a61543d059b78e320736fc9c
2019-02-19Merge "Disable native_coverage for webrtc" am: 5d8bf68015 am: 8659d14bffPirama Arumuga Nainar
am: 14875d2698 Change-Id: I9cdde8e054367734218c7acbf4092a46f392d5fe
2019-02-19Merge "Disable native_coverage for webrtc" am: 5d8bf68015Pirama Arumuga Nainar
am: 8659d14bff Change-Id: I6f350eeed980c8761715dc2251fa27377ffc9d92
2019-02-19Merge "Disable native_coverage for webrtc"Pirama Arumuga Nainar
am: 5d8bf68015 Change-Id: If504e10094c980f26d12235011744a4cdd397d51
2019-02-19Merge "Disable native_coverage for webrtc"android-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-releaseTreehugger Robot
2019-02-15Disable native_coverage for webrtcPirama Arumuga Nainar
Bug: http://b/116873221 Linking fails at O0 because VTable for InStream and OutStream (defined in webrtc/common_types.h) is not found. The fix is to mark the Rewind function in both classes as pure virtual. It's better to disable native_coverage here rather than pick up a downstream change to an external codebase. Test: Build with coverage Change-Id: I13375f8fa02c2e9330d30f091f069518e2908f51
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 92197c43df -s ours am: be8d1a5b99 -s ours am: 6b24b14ebf -s ours Change-Id: I3a18e457808e18e7185dce159ab391763f24f62f
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 92197c43df -s ours am: be8d1a5b99 -s ours Change-Id: I2b939ae3cfaff23b5757d28cc0abb1af5b31f778
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
am: 92197c43df -s ours Change-Id: Ic2f3c544f4751029af6735d635e9032a25bd5774
2018-10-24Merge pie-platform-release to aosp-master - DO NOT MERGEandroid-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-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7android-n-iot-release-ihome-igv1nougat-iot-releaseBill Yi
Change-Id: Id465b51d34b2f2df9ad291beb2be8d03f862005f
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 1cc6c594e2 -s ours am: 6533582f95 -s ours Change-Id: I33540a8123694e1855424dfba0784bc22a3b95f8
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 1cc6c594e2 -s ours Change-Id: I7eb57ab8852aace6d7bd86bb90409c2d055373c7
2018-10-24Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi
Change-Id: I2bb8116ffb8f9d56cd5799aff635cb7b62da6169
2018-07-11Merge "Remove dependency on std::tr1" am: 9d1c18ddd0 am: 7209da4601Haibo Huang
am: 20c423cdf2 Change-Id: I29da17cbfc741de3312b19e19eaa3e1a83f3a033
2018-07-11Merge "Remove dependency on std::tr1" am: 9d1c18ddd0Haibo Huang
am: 7209da4601 Change-Id: I1ec96b9d37ddf375e4ec6d0b633a5b96b086b08d
2018-07-11Merge "Remove dependency on std::tr1"android-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-releaseHaibo Huang
am: 9d1c18ddd0 Change-Id: I4fdb2586216d6ce5520bb47bf692a767d40c34a3
2018-07-11Merge "Remove dependency on std::tr1"android-p-preview-5android-n-iot-release-smart-display-r2Treehugger Robot
2018-07-11Remove dependency on std::tr1Haibo Huang
This change is to make webrtc compatible with new googletest. Test: compile Change-Id: I91fa5ce8a986e35209986bef5dc0b2202155623f
2018-07-10Merge "Add METADATA for webrtc" am: a95c577462 am: 1efc0f0c83Haibo Huang
am: efa4661f26 Change-Id: I61c9b9ad4cb13431ca0ba12b9bdd2538d358a9c9
2018-07-10Merge "Add METADATA for webrtc" am: a95c577462Haibo Huang
am: 1efc0f0c83 Change-Id: I5ed2ecb4f80220285399a3882981edffc338b09e
2018-07-10Merge "Add METADATA for webrtc"Haibo Huang
am: a95c577462 Change-Id: I3628dba33bb3f3593eb4b5c66d595f3f02575c38
2018-07-11Merge "Add METADATA for webrtc"Treehugger Robot
2018-07-10Add METADATA for webrtcHaibo Huang
Test: NA Exempt-From-Owner-Approval: conflict with upstream OWNERS file Change-Id: I28f133b0dfd684a8e83ce83c3f58ceda10f55f26
2018-01-30Snap for 4574286 from 4bf309ee56108e775a2d8f9676ee5b91c025b199 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: I3483a86a4bf6f8a2603689b24443cdbd34a26f8e
2018-01-30Merge "Add empty Android.mk to prevent recursion." am: dbf4e66374 am: c6ebc088d5android-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-devDan Willemsen
am: 9f02eec6dd Change-Id: Ica423b2f555491560a66c4958f8cdd200d3fefbb
2018-01-30Merge "Add empty Android.mk to prevent recursion." am: dbf4e66374Dan Willemsen
am: c6ebc088d5 Change-Id: I97d9b65784d9d75c0767d17e65c68ddeb6e5e12b
2018-01-30Merge "Add empty Android.mk to prevent recursion."Dan Willemsen
am: dbf4e66374 Change-Id: Iff8ffb5b67b29598bd6aa3cacffeef3b6b63efea
2018-01-30Merge "Add empty Android.mk to prevent recursion."android-wear-p-preview-2android-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-7android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8o-mr1-iot-preview-7Treehugger Robot
2018-01-29Add empty Android.mk to prevent recursion.Dan Willemsen
Bug: 72661763 Test: find . -name 'Android.mk' Change-Id: I8373f1433561bd9ae4652dc58bd2fbcb8e7d721e
2017-12-17Snap for 4507345 from 84678cdad689bb05139ee4df1d0b6702979cc50f to pi-releaseandroid-build-team Robot
Change-Id: I7b7d30abc0217c9ae7f0e3f3f1200e028187ac5f
2017-12-15Merge "Remove dead symlink." am: 6c96047132 am: e246bc0c46Steven Moreland
am: 971b703804 Change-Id: I2d40eded09c7b479e77fd392a24f886b4dcfa033
2017-12-15Merge "Remove dead symlink." am: 6c96047132Steven Moreland
am: e246bc0c46 Change-Id: I16453b38257021818fa473996680864a421ad5f9
2017-12-15Merge "Remove dead symlink."Steven Moreland
am: 6c96047132 Change-Id: I8178efea67947adcf4395a84b89f85dbe445dff4
2017-12-15Merge "Remove dead symlink."android-wear-8.0.0_r1Treehugger Robot
2017-12-15Remove dead symlink.Steven Moreland
Bug: none Test: none Change-Id: I0be329b9137db166320cb4820c8cd4bbcb8b3e7f
2017-11-15Snap for 4453288 from 9d6b1fe8135d069f7601c8886be5bd17ca0fccfd to pi-releaseandroid-build-team Robot
Change-Id: I52452440ba4ea9c059cbfbac92bec6db18e2cb2b
2017-11-15Merge remote-tracking branch 'goog/stage-aosp-master' into HEADXin Li
am: a095605674 Change-Id: I459fd3092be0bd325272eae31efa5ea616ef473a
2017-11-14Merge remote-tracking branch 'goog/stage-aosp-master' into HEADXin Li
Change-Id: I2f688d32edc062ef5ddd5fe2afe9acfadfa3c73b
2017-11-13Merge commit 'd204c81fdce889de60ce69cfa5c3da1249dc8533' into HEADXin Li
Change-Id: Idf8e115f8db81f5ec76553c405ba58f47d80c0f8
2017-10-29Snap for 4422293 from b3654bfbddedd7bbc3bff9f49134d28506eb6758 to pi-releaseandroid-build-team Robot
Change-Id: If10df1c6b04b31d48c100d4ca6d626f90e9babe2
2017-10-27Merge "Use -Werror in external/webrtc" am: 5768aa953f am: 0507baf9b1Chih-hung Hsieh
am: 65f75275ee Change-Id: I497bdbc8e44368985d5aa4a7005f7fa1d989bfc9
2017-10-27Merge "Use -Werror in external/webrtc" am: 5768aa953fChih-hung Hsieh
am: 0507baf9b1 Change-Id: I7cb440b8f68e201966e25996091a9d1d1f6f073a
2017-10-27Merge "Use -Werror in external/webrtc"Chih-hung Hsieh
am: 5768aa953f Change-Id: Iae812431d1c34002e931e497f1b70cbf2f698ffa
2017-10-26Merge "Use -Werror in external/webrtc"android-o-mr1-iot-preview-6o-mr1-iot-preview-6Chih-hung Hsieh
2017-10-26Use -Werror in external/webrtcChih-Hung Hsieh
* Suppress existing missing-braces warning. Bug: 66996870 Test: build with WITH_TIDY=1 Change-Id: I56af504b26843d0c9e6a56699f30996d8a1b74b8
2017-10-26Merge "Add 'vendor: true' to headers to fix vndk builds" am: c333849418 am: ↵Dan Willemsen
666817c7d1 am: 2f7f5be1df Change-Id: I0606da5136a96ef7fd098f6197ed9906a09cf7e8
2017-10-26Merge "Add 'vendor: true' to headers to fix vndk builds" am: c333849418Dan Willemsen
am: 666817c7d1 Change-Id: Ic02d71e88487502a1af99ade46329b68bf5f13dd
2017-10-26Merge "Add 'vendor: true' to headers to fix vndk builds"Dan Willemsen
am: c333849418 Change-Id: I2a34f700a1735f2ae000b34ae137a96553ac367e
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-12 17:08:21 +0000