summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-01-24Snap for 4562879 from b30b23d7ddb26f452c31fe8b28ebc59e5639ec3f 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: I5629e430f9cc5bb45e83f3666d23b935c1eefa60
2018-01-24Merge "Include libz.a in the NDK." am: 0d8ec3aa93 am: d14e79874dandroid-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 Albert
am: 3a7ae4462c Change-Id: I13d82beb6aa880836c1ffa8399cd298c0a69ecd6
2018-01-24Merge "Include libz.a in the NDK." am: 0d8ec3aa93Dan Albert
am: d14e79874d Change-Id: Iee47ef27023b53d31b2653955beebdf5c79e10ba
2018-01-24Merge "Include libz.a in the NDK."Dan Albert
am: 0d8ec3aa93 Change-Id: Ib7afd223f1ff3a674dae56cd1ecfd3a0938ab069
2018-01-24Merge "Include libz.a in the NDK."android-wear-p-preview-2android-wear-8.0.0_r1android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8o-mr1-iot-preview-7Treehugger Robot
2018-01-23Include libz.a in the NDK.Dan Albert
Test: build/soong/scripts/build-ndk-prebuilts.sh Bug: https://github.com/android-ndk/ndk/issues/272 Change-Id: Icd3b737b443afa18a87558447808dceb2a401036
2018-01-23merge in pi-release history after reset to mastergitbuildkicker
2018-01-23merge in pi-release history after reset to mastergitbuildkicker
2018-01-23Snap for 4560043 from fa5467efd7b02185711255ea83bbdc78dbdb91d0 to pi-releaseandroid-build-team Robot
Change-Id: I7b4f492b9815eac5ef4b62797a6e53003d2e92b8
2018-01-22Merge "Cherry-pick fix for 1.2.11 deterministic output regression" am: ↵Przemyslaw Szczepaniak
1be35eaf4d am: 5613fd2c5f am: 32de7d459a Change-Id: Ia60ebd57eeaf79601f4e876d6d03a503a2bbf1b9
2018-01-22Merge "Cherry-pick fix for 1.2.11 deterministic output regression" am: ↵Przemyslaw Szczepaniak
1be35eaf4d am: 5613fd2c5f Change-Id: I0a6657f237f3eb97a8c7a8e5915a0610295c05a7
2018-01-22Merge "Cherry-pick fix for 1.2.11 deterministic output regression"Przemyslaw Szczepaniak
am: 1be35eaf4d Change-Id: I569fe97528b71dde2a981e563622be7e49929bc5
2018-01-22Merge "Cherry-pick fix for 1.2.11 deterministic output regression"Przemyslaw Szczepaniak
2018-01-21Snap for 4557233 from 2c9c51f114436bc69fa15376a3e06c777dc4e6ff to pi-releaseandroid-build-team Robot
Change-Id: Ia39e27a440b73530f79e29f2d1e887113fb235e3
2018-01-19Merge "Fixing app compat issue b/72143978" am: 7bc4454186 am: 10b6406590Ian Pedowitz
am: c52053e718 Change-Id: I9fe03a711cc63cd83daff561fc6f72280febd050
2018-01-19Merge "Fixing app compat issue b/72143978" am: 7bc4454186Ian Pedowitz
am: 10b6406590 Change-Id: I5be2f77e59e3bc098c3323befc19ba9e7b35b121
2018-01-19Merge "Fixing app compat issue b/72143978"Ian Pedowitz
am: 7bc4454186 Change-Id: I6f5cc5df58539dd0efd476c4f198ee6c10a8339c
2018-01-19Merge cherrypicks of [3478339, 3481269, 3479743, 3478340, 3480765, 3479744, ↵android-build-team Robot
3479745, 3479746, 3479747, 3481308] into pi-release Change-Id: I0aa012b1a1da3dc4c8789c54013bfe074b1deffa
2018-01-19Fixing app compat issue b/72143978Ian Pedowitz
Revert "Remove obsolete workaround." This reverts commit 3471433557a25c60e53329e7fa5914bf5ce4a744. Bug: 72143978 Bug: 24465209 Test: Tested failing case on sailfish, reverted back all CL's since Test: 3471433 for b/24465209 and apps open Change-Id: Ia124f2216ba724184b73616a29f08fc906daaff4 (cherry picked from commit cca7bd4c0073dc2587e36790de76e7eba2f1807b)
2018-01-19Merge "Fixing app compat issue b/72143978"Treehugger Robot
2018-01-18Fixing app compat issue b/72143978Ian Pedowitz
Revert "Remove obsolete workaround." This reverts commit 3471433557a25c60e53329e7fa5914bf5ce4a744. Bug: 72143978 Bug: 24465209 Test: Tested failing case on sailfish, reverted back all CL's since Test: 3471433 for b/24465209 and apps open Change-Id: Ia124f2216ba724184b73616a29f08fc906daaff4
2018-01-18Cherry-pick fix for 1.2.11 deterministic output regressionPrzemyslaw Szczepaniak
GitHub bug containing fix: https://github.com/madler/zlib/issues/275 commit: f9694097dd69354b03cb8af959094c7f260db0a1: Permit a deflateParams() parameter change as soon as possible. This commit allows a parameter change even if the input data has not all been compressed and copied to the application output buffer, so long as all of the input data has been compressed to the internal pending output buffer. This also allows an immediate deflateParams change so long as there have been no deflate calls since initialization or reset. Test: libcore.java.util.zip.DeflateRegressionTest Bug: 72090715 Change-Id: I532de817e042d9715aafcffddd1eb622abdb5aec
2018-01-11Snap for 4539010 from 8844b908c30cc6e194d0029fa02deba17a444a67 to pi-releaseandroid-build-team Robot
Change-Id: I718532a53e76d3ac76d037fef676aa316780519b
2018-01-10Merge "Remove obsolete workaround." am: c0c4c4e5c4 am: 1e91d716f8Elliott Hughes
am: e4501e7f75 Change-Id: Id859e77d4d5e2c522d61fbb9066809785034928e
2018-01-10Merge "Remove obsolete workaround." am: c0c4c4e5c4Elliott Hughes
am: 1e91d716f8 Change-Id: Ie68abd7d74530609d7602d19a041f27821a701ad
2018-01-10Merge "Remove obsolete workaround."Elliott Hughes
am: c0c4c4e5c4 Change-Id: Ic11207f248f5dc68b4d4b2b658d0c2c2d4e6caf0
2018-01-10Merge "Remove obsolete workaround."Treehugger Robot
2018-01-09Remove obsolete workaround.Elliott Hughes
Bug: http://b/24465209 Test: manually ran the app. Change-Id: I9c60c7c1e8d54b7edbb1d7ee39102b002a57737c
2017-12-28Snap for 4519870 from bf9b2a1bb5a43957218acbb3eb383da6bb4601df to pi-releaseandroid-build-team Robot
Change-Id: I524239aae4756a95ebecc10bf4542cc977ebf4fd
2017-12-27Merge "Remove zlib_fingerprint." am: 45db7492d6 am: 9964f0190cSen Jiang
am: 57cd055c81 Change-Id: I6946a361834bc1f05a2a80fac22d866ada181c5d
2017-12-27Merge "Remove zlib_fingerprint." am: 45db7492d6Sen Jiang
am: 9964f0190c Change-Id: I344b6a0e4e5d8f447d104941f8cb76c50066b3ea
2017-12-27Merge "Remove zlib_fingerprint."Sen Jiang
am: 45db7492d6 Change-Id: I83bc61fb886c0a24e7acb78b358d0dc63cbd1622
2017-12-27Merge "Remove zlib_fingerprint."Treehugger Robot
2017-12-19Remove zlib_fingerprint.Sen Jiang
Test: m dist Change-Id: I6cbe898a06021b09c5eb1f2cb98ff8bb651d4530
2017-10-04Snap for 4375922 from f68097d3719fad8abf533314ccf08b65b88274be to pi-releaseandroid-build-team Robot
Change-Id: I24a7ab69bf7c39062b9e84894de88c392e77a453
2017-10-03Merge "Reland "Update zlib to 1.2.11"" am: 3ff5469268 am: 80092b6bba am: ↵Leon Scroggins III
f7add9a4e8 am: 02f961e195 Change-Id: I7518eedc6aabd9a5332c2d13baba9a24c6114ce8
2017-10-03Merge "Reland "Update zlib to 1.2.11"" am: 3ff5469268 am: 80092b6bbaLeon Scroggins III
am: f7add9a4e8 Change-Id: Ie592451a5e55e6679ebbcecc031ba4ef53f8fb64
2017-10-03Merge "Reland "Update zlib to 1.2.11"" am: 3ff5469268Leon Scroggins III
am: 80092b6bba Change-Id: Iaea0e44302184f3e218f41effb1ee43d66e1f4fa
2017-10-03Merge "Reland "Update zlib to 1.2.11""android-o-mr1-iot-preview-6o-mr1-iot-preview-6Leon Scroggins III
am: 3ff5469268 Change-Id: I9c097bd86ae3d088dd402c530b45eb60ee01a29d
2017-10-03Merge "Reland "Update zlib to 1.2.11""Treehugger Robot
2017-10-02Reland "Update zlib to 1.2.11"Leon Scroggins III
Bug: 65743040 Test: run cts -m CtsLibcoreTestCases This reverts commit 20877b3d8f8c1c2eb639905e4732356e03f38ff7. zlib was previously reverted to 1.2.8 due to a bug in other code that relied on the specific version of zlib. This bug should no longer be present in master, so reland the update.
2017-09-30release-request-b4bc7b84-64b6-4176-8f16-ce17068fad13-for-git_pi-release-4370 ↵android-build-team Robot
135 snap-temp-L93500000107644030 Change-Id: I3f47f41f0b5128aea9c6a3bc9041018dfc52af9e
2017-09-30Merge "Use -Werror in external/zlib" am: 77813b7ffe am: 897d9a491e am: ↵Chih-Hung Hsieh
5f9c3c5b5c am: 462fd64d0c Change-Id: Iab5c2b9a87085394742799b08ee34ce96d83d4ac
2017-09-30Merge "Use -Werror in external/zlib" am: 77813b7ffe am: 897d9a491eChih-Hung Hsieh
am: 5f9c3c5b5c Change-Id: Ib97d9849f61cdb8650b9b0df22731e4eb52feb06
2017-09-30Merge "Use -Werror in external/zlib" am: 77813b7ffeChih-Hung Hsieh
am: 897d9a491e Change-Id: Ibd41c83e1bc0402beb3726547569a5489d14aa6c
2017-09-29Merge "Use -Werror in external/zlib"Chih-Hung Hsieh
am: 77813b7ffe Change-Id: Ic752523752a067dd6ac57e34fd79056d377ec203
2017-09-29Merge "Use -Werror in external/zlib"Treehugger Robot
2017-09-29Use -Werror in external/zlibChih-Hung Hsieh
Bug: 66996870 Test: build with WITH_TIDY=1 Change-Id: I5d03dba3e95eb5fc05ef128763ed3c271f039d21
2017-09-29Merge "Remove libz-host module" am: dac11656c6 am: af243f2743 am: d22b7e4487Dan Willemsen
am: 7725d4fb65 Change-Id: If849fe00a575479e22be26450a36cf75ba57a9a6
2017-09-29Merge "Remove libz-host module" am: dac11656c6 am: af243f2743Dan Willemsen
am: d22b7e4487 Change-Id: Ibb079feaee993b7ff34565e7215a3a294428c977