summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-04-26Merge "Remove kudasov from apkzlib owners" am: d0a6efa0c8 am: 8513d4cc36 am: ↵android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid-s-v2-preview-1Fedor Kudasov
0928779d99 Original change: https://android-review.googlesource.com/c/platform/tools/apkzlib/+/1686565 Change-Id: I8d1a7941d72a07195bc3be795672b1e72c4687c4
2021-04-26Merge "Remove kudasov from apkzlib owners" am: d0a6efa0c8 am: 8513d4cc36Fedor Kudasov
Original change: https://android-review.googlesource.com/c/platform/tools/apkzlib/+/1686565 Change-Id: Id37b5d45b0aaded46734c113a35d3f8e1839bc15
2021-04-26Merge "Remove kudasov from apkzlib owners" am: d0a6efa0c8android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Fedor Kudasov
Original change: https://android-review.googlesource.com/c/platform/tools/apkzlib/+/1686565 Change-Id: If1b58a553dfbef824209b10b8d9ed1abc14ecfa5
2021-04-26Merge "Remove kudasov from apkzlib owners"android-s-beta-2android-s-beta-1Fedor Kudasov
2021-04-26Update language to comply with Android's inclusive language guidance am: ↵Pratyush More
f092281efb am: 32459c15b7 am: 47fc00af63 Original change: https://android-review.googlesource.com/c/platform/tools/apkzlib/+/1685665 Change-Id: Id7be23bb183490db20be38f1ee06e6abec778fe2
2021-04-26Update language to comply with Android's inclusive language guidance am: ↵Pratyush More
f092281efb am: 32459c15b7 Original change: https://android-review.googlesource.com/c/platform/tools/apkzlib/+/1685665 Change-Id: I0b290852b42dc927a395bfae1e83bec9d7c6ee7e
2021-04-26Update language to comply with Android's inclusive language guidance am: ↵Pratyush More
f092281efb Original change: https://android-review.googlesource.com/c/platform/tools/apkzlib/+/1685665 Change-Id: If1f25d4d83c2d925fc86b7dc235c781875ad5f67
2021-04-26Remove kudasov from apkzlib ownersFedor Kudasov
Change-Id: Ia8cca9e4c426ddc79fc59e28891ccc09543cc4b5
2021-04-23Update language to comply with Android's inclusive language guidancePratyush More
See https://source.android.com/setup/contribute/respectful-code for reference BUG=162536543 Change-Id: If537f659e1a848a7958051651608c626e81b0cc1
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to tools/apkzlib am: a3e6acb82f am: 1df9124a2e ↵Bob Badour
am: 451b1ee06c Original change: https://android-review.googlesource.com/c/platform/tools/apkzlib/+/1589131 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id2dca45244d8ea1cd6fd72f8ce0e3aa7e6c623b9
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to tools/apkzlib am: a3e6acb82f am: 1df9124a2eBob Badour
Original change: https://android-review.googlesource.com/c/platform/tools/apkzlib/+/1589131 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8e237adad54b2f13f05cbbd75e41642674089a7e
2021-02-15[LSC] Add LOCAL_LICENSE_KINDS to tools/apkzlib am: a3e6acb82fBob Badour
Original change: https://android-review.googlesource.com/c/platform/tools/apkzlib/+/1589131 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib9ce498593774f2ded3fabaf1fef8d5e227a70c0
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to tools/apkzlibandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-GFDL SPDX-license-identifier-GPL legacy_notice to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ib7476689c3cf18a67a57361d3cceafff65d67568
2021-02-04Fix license_type. Contains GFDL am: 1c2be99c6a am: 7f6b693442 am: 99d5c0f3b7Bob Badour
Original change: https://android-review.googlesource.com/c/platform/tools/apkzlib/+/1573984 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I32672e6c51d699fae31a290853f8e7304fe7e3fe
2021-02-04Fix license_type. Contains GFDL am: 1c2be99c6a am: 7f6b693442Bob Badour
Original change: https://android-review.googlesource.com/c/platform/tools/apkzlib/+/1573984 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5b3a274e4c80635d94d890cf1ffbd15e58d63fda
2021-02-04Fix license_type. Contains GFDL am: 1c2be99c6aBob Badour
Original change: https://android-review.googlesource.com/c/platform/tools/apkzlib/+/1573984 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I122d66e602da9697fb100d07cbebbcd8bb2a5d6e
2021-02-03Fix license_type. Contains GFDLBob Badour
See: http://go/android-license-checking-v2-lsc Test: m all Bug: 151953481 Bug: 151177513 Bug: 67772237 Exempt-From-Owner-Approval: janitorial work Change-Id: Ia74281c12ca02c8868989178f4f9453c80e7230a
2019-11-04Remove obsolete BUILD file. am: 577a107c40 am: bf61dd3c1br_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-releaseJohn Cater
am: eba4cc5b98 Change-Id: I26e9c0bae6cc427af1d3a51ce74c096bc43d3592
2019-11-04Remove obsolete BUILD file. am: 577a107c40android-r-preview-4android-r-preview-3android-r-preview-2android-r-beta-3android-r-beta-2John Cater
am: bf61dd3c1b Change-Id: I89e6d66b495b91ef35a2c6eba18e20fcb77d761c
2019-11-04Remove obsolete BUILD file.android-r-preview-1John Cater
am: 577a107c40 Change-Id: Iad309fe318a52c3cd96aa61792862dbc738454b9
2019-09-20Remove obsolete BUILD file.John Cater
Test: Manual build. Change-Id: I59d4441c3f9a657d64a8484553f46807eb86af1d
2019-04-16[automerger skipped] Update apkzlib for guava 27.1 am: e0ad28a80a am: ↵Colin Cross
f1aacb0c3a -s ours am: fe44a9d597 -s ours am skip reason: change_id I4a0519dc38e236cb32eb16019da11eaeaab35ad5 with SHA1 596644e00f is in history Change-Id: I85984506c8404ff4af5858e8dfc2a01b4b56736e
2019-04-16[automerger skipped] Update apkzlib for guava 27.1 am: e0ad28a80andk-sysroot-r21Colin Cross
am: f1aacb0c3a -s ours am skip reason: change_id I4a0519dc38e236cb32eb16019da11eaeaab35ad5 with SHA1 596644e00f is in history Change-Id: I5a0c9b2df2b18cc457325a1858037c5d1ad77e39
2019-04-16Update apkzlib for guava 27.1Colin Cross
am: e0ad28a80a Change-Id: If59899de046a00f7938e94e5d4b2a24e4dee8dc8
2019-04-15Update apkzlib for guava 27.1Colin Cross
Files.fileTreeTraverser() has been replaced with Files.fileTraverser(). Bug: 130306229 Test: m checkbuild Change-Id: I4a0519dc38e236cb32eb16019da11eaeaab35ad5 Merged-In: I4a0519dc38e236cb32eb16019da11eaeaab35ad5 Exempt-From-Owner-Approval: cherry pick (cherry picked from commit 596644e00f1b76f35e2adff612e8f1b389b987c4)
2019-04-15Update apkzlib for guava 27.1Colin Cross
am: 596644e00f Change-Id: I0a75aeef80b2a0d71fb517c32f6e115f3793ec52
2019-04-11Update apkzlib for guava 27.1Colin Cross
Files.fileTreeTraverser() has been replaced with Files.fileTraverser(). Bug: 130306229 Test: m checkbuild Change-Id: I4a0519dc38e236cb32eb16019da11eaeaab35ad5
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: c400ec7efc Change-Id: I69bbc643545ee9dd1f02266723e30a1589c335ed
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: I03ffe7595371d873200d829d71ced8434de25db9
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: I3149542d902e857c83935b04148fdc12fc36252a
2019-01-16Add default code reviewers into OWNERS am: 598aa978fa am: d592876975Chih-Hung Hsieh
am: 7dcfe37463 Change-Id: I97f0f359266c3cbefd46dad422a58f2a11e96322
2019-01-16Add default code reviewers into OWNERS am: 598aa978faChih-Hung Hsieh
am: d592876975 Change-Id: If53bdab6e925ab3f6cb012757c0e2f9853a1f8b4
2019-01-16Add default code reviewers into OWNERSChih-Hung Hsieh
am: 598aa978fa Change-Id: Iec7620db70256bcb07045e7143f69e38e8308444
2019-01-16Add default code reviewers into OWNERSandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1Chih-Hung Hsieh
Bug: 33166666 Test: gerrit uploader Change-Id: I7b24a61b21ddddbfd1b858777e3aa86051b3961a
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 29560e9fa9 -s ours am: 819e21d51b -s ours am: c666101e0b -s ours Change-Id: I6fdf39afeb11328478db52bb0c8b7f353fc5294d
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 29560e9fa9 -s ours am: 819e21d51b -s ours Change-Id: Ide94357ac5ac4a75eaae81d79b24a95fa01679f4
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
am: 29560e9fa9 -s ours Change-Id: Idadf3ae6adb50a30fe1e50b3bfae82e1eaa90618
2018-10-24Merge pie-platform-release to aosp-master - DO NOT MERGEandroid-wear-8.0.0_r2Bill Yi
Change-Id: I740adff432f251b76d330435b65c40b3e6d7d20f
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 2c92799d99 -s ours am: 44181d0555 -s ours Change-Id: I209b3ad88b9194fd030599f6f2ec9c4abdedd155
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 2c92799d99 -s ours Change-Id: I43a9c55c4a894d7155ca875bde725aa0dd6a246a
2018-10-24Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi
Change-Id: I935a1f45fde7e697e60d81b80a3b169c8a5a86e7
2018-08-03Modified Android.bp to compile for API 24 am: 22710486f6 am: 65da155809 am: ↵Idries Hamadi
976bdff695 am: 61d24668b1 Change-Id: I9573bf7d47d75e8ca7e3bad15ccc052526e0761b
2018-08-03Modified Android.bp to compile for API 24 am: 22710486f6 am: 65da155809Idries Hamadi
am: 976bdff695 Change-Id: Ic634f0c994a6a29c332b242183e30009ff90d3c7
2018-08-03Modified Android.bp to compile for API 24 am: 22710486f6Idries Hamadi
am: 65da155809 Change-Id: I0247a587fa71274f0e9295fa929ef118a2268d87
2018-08-03Modified Android.bp to compile for API 24master-cuttlefish-testing-releaseIdries Hamadi
am: 22710486f6 Change-Id: Ic721c01b8b3bf3ffe53ac24a046b05bef9377b1b
2018-06-15Modified Android.bp to compile for API 24Idries Hamadi
Test: mm Change-Id: I5b222c684ebc4fd94b5e6a7d04c648939b7d97fc
2018-06-11Fixed apkzlib .bp file to match new file locations am: fe54ae3e67 am: 953093b6c2Idries Hamadi
am: 69834845e6 Change-Id: I1a05c9f04177336acbdc2faf446cf2cdda8a0f02
2018-06-11Fixed apkzlib .bp file to match new file locations am: fe54ae3e67Idries Hamadi
am: 953093b6c2 Change-Id: Ia873818e921d33960dfd16e57ca2701fd6f157dd
2018-06-11Fixed apkzlib .bp file to match new file locationsIdries Hamadi
am: fe54ae3e67 Change-Id: Icd7eb0d52c3eb1fcdbb3a38a758dd18eebdae2ab
2018-06-08Fixed apkzlib .bp file to match new file locationsandroid-p-preview-5android-p-preview-4Idries Hamadi
Test: mm Change-Id: I9559385530b7ac20d3ca65d55c5d9bb53bebbe8e
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 20:59:21 +0000