summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/jarjar am: ae666337a5 am: ↵android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-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-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-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-devandroid12--mainline-releaseandroid-s-v2-preview-1Bob Badour
6937afe210 am: 14e8688981 Original change: https://android-review.googlesource.com/c/platform/external/jarjar/+/1588919 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4c579af434023d2ac4425f610612d58c038ea171
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/jarjar am: ae666337a5 am: 6937afe210Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/jarjar/+/1588919 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I68a46bda89308dc66752d4f8864207a6eea22436
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/jarjar am: ae666337a5android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/jarjar/+/1588919 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4b5fde01e68f41b1252d9eebe3431ff0d3cdf78d
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/jarjarandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I541f7c16d5a1bb6a7b1b87900f9796ea0438459f
2020-09-16[automerger skipped] Start using ASM6 in jarjar am: f5f35e26f7 am: ↵Aurimas Liutikas
b633f13f1b am: 0429a93299 am: 98fe5fb8fb am: 569afa9f7c am: 74fa38efb3 -s ours am skip reason: Change-Id Ic2d29d0c1ff9cbad282f81a3c9e8ecc5ab6d731a with SHA-1 f5f35e26f7 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/jarjar/+/12470582 Change-Id: I47f35ba7539be440a4ba6473128f9b98505e58ed
2020-08-27Start using ASM6 in jarjar am: f5f35e26f7 am: b633f13f1b am: 0429a93299 am: ↵android-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_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_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-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_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_r12android11-mainline-tethering-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-releaseAurimas Liutikas
98fe5fb8fb am: 569afa9f7c Original change: https://android-review.googlesource.com/c/platform/external/jarjar/+/1339699 Exempt-From-Owner-Approval: Snapping to master Bug: 146727827 Test: build Change-Id: Ic2d29d0c1ff9cbad282f81a3c9e8ecc5ab6d731a Merged-in: Ic2d29d0c1ff9cbad282f81a3c9e8ecc5ab6d731a
2020-06-16Start using ASM6 in jarjar am: f5f35e26f7 am: b633f13f1b am: 0429a93299 am: ↵Aurimas Liutikas
98fe5fb8fb am: 569afa9f7c Original change: https://android-review.googlesource.com/c/platform/external/jarjar/+/1339699 Change-Id: I9bc1089b81225d58ede5a093804a1e68ee59e2b3
2020-06-16Start using ASM6 in jarjar am: f5f35e26f7 am: b633f13f1b am: 0429a93299 am: ↵Aurimas Liutikas
98fe5fb8fb Original change: https://android-review.googlesource.com/c/platform/external/jarjar/+/1339699 Change-Id: Ibfc5b2a9eb2f429d602370749efb8e92f9af6c96
2020-06-16Start using ASM6 in jarjar am: f5f35e26f7 am: b633f13f1b am: 0429a93299Aurimas Liutikas
Original change: https://android-review.googlesource.com/c/platform/external/jarjar/+/1339699 Change-Id: Idb3485e13ae18bd9998bc6d57fa6a5a057dcef79
2020-06-16Start using ASM6 in jarjar am: f5f35e26f7 am: b633f13f1bAurimas Liutikas
Original change: https://android-review.googlesource.com/c/platform/external/jarjar/+/1339699 Change-Id: Ic3d504e6d6bad0d72b20f11438fc691e7058e156
2020-06-16Start using ASM6 in jarjar am: f5f35e26f7Aurimas Liutikas
Original change: https://android-review.googlesource.com/c/platform/external/jarjar/+/1339699 Change-Id: I9ed963fea268ed30d26eb4c29704e76e0aef2dbf
2020-06-16Start using ASM6 in jarjarandroid-r-beta-3android-r-beta-2Aurimas Liutikas
r.android.com/497292 only started compiling against ASM 6.0, but did not actually start using ASM6. This change is a manual cherry-pick of https://github.com/google/jarjar/commit/4b3dcad485871731ef0c9a4f02c055eb5eaa11c2 This is needed as metalava target gets jarjar'ed and now includes features that require ASM5+ Test: make -j Change-Id: Ic2d29d0c1ff9cbad282f81a3c9e8ecc5ab6d731a
2020-05-04Merge "Add RemoveAndroidCompatAnnotationsJarTransformer to JarJar. am: ↵TreeHugger Robot
0ecdee5310 am: 78d3f714de am: 2a965ef23c am: 2e6d52a2cf am: 3f468d450f"
2020-04-29Add METADATA to jarjar: Apache2=NOTICE am: f4eae1c594 am: b542084f75 am: ↵Bob Badour
67602892ef am: c0ac8765fc am: 0340d7711f Change-Id: I78f64bb216946eb5a82ebd4082250a6efc8e200d
2020-04-29Add METADATA to jarjar: Apache2=NOTICE am: f4eae1c594 am: b542084f75 am: ↵Bob Badour
67602892ef am: c0ac8765fc Change-Id: I8759d09a650d1ea6a3d291a07940edcebf865d24
2020-04-29Add METADATA to jarjar: Apache2=NOTICE am: f4eae1c594 am: b542084f75 am: ↵Bob Badour
67602892ef Change-Id: Ib5549a1bf4dea2dfe3286c7c556c5b8fcf9ceb92
2020-04-29Add METADATA to jarjar: Apache2=NOTICE am: f4eae1c594 am: b542084f75Bob Badour
Change-Id: Iff07b1e671003517a7c4bbe7dc7bd5d5f153a2ba
2020-04-29Add METADATA to jarjar: Apache2=NOTICE am: f4eae1c594Bob Badour
Change-Id: I810cebfddbcb0facbaaa160df770ff6bf30b4c79
2020-04-28Add METADATA to jarjar: Apache2=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: If3b044debd18c5d26398cfa86841d8ce442a4e0e
2020-04-21[automerger skipped] Add RemoveAndroidCompatAnnotationsJarTransformer to ↵Artur Satayev
JarJar. am: 05bc010f95 am: 2cbb48ea11 am: 51d1c00fbf am: e6ec4637ea -s ours am: 88894f1790 -s ours am skip reason: Change-Id Ic95dce29f81fe9ce80e607150f294d7e105d1abe with SHA-1 05bc010f95 is in history Change-Id: I34407d99a4c170f9f6b2d1d595d89de084b91c0b
2020-04-21[automerger skipped] Add RemoveAndroidCompatAnnotationsJarTransformer to ↵Artur Satayev
JarJar. am: 05bc010f95 am: 2cbb48ea11 am: 51d1c00fbf am: e6ec4637ea -s ours am skip reason: Change-Id Ic95dce29f81fe9ce80e607150f294d7e105d1abe with SHA-1 05bc010f95 is in history Change-Id: I806e4d0db173eee1bb2db8ff546aa11402725e85
2020-04-21[automerger skipped] Add RemoveAndroidCompatAnnotationsJarTransformer to ↵Artur Satayev
JarJar. am: 05bc010f95 am: 2cbb48ea11 -s ours am: 8315059a13 -s ours am: 627d25f07e -s ours am skip reason: Change-Id Ic95dce29f81fe9ce80e607150f294d7e105d1abe with SHA-1 05bc010f95 is in history Change-Id: I065d8aefcaf94342d00b6cebc1e2e8d25c83dfbd
2020-04-21[automerger skipped] Add RemoveAndroidCompatAnnotationsJarTransformer to ↵Artur Satayev
JarJar. am: 05bc010f95 -s ours am: 1799b58a27 -s ours am: 53c85f5841 -s ours am: 8776693de6 -s ours am skip reason: Change-Id Ic95dce29f81fe9ce80e607150f294d7e105d1abe with SHA-1 0ecdee5310 is in history Change-Id: I69890dfb4aa37d6cf6e90feca8aaa0246ad1b7ff
2020-04-21Add RemoveAndroidCompatAnnotationsJarTransformer to JarJar. am: 05bc010f95 ↵Artur Satayev
am: 2cbb48ea11 am: 51d1c00fbf Change-Id: I7a9230c4167a184218145079ce2e134db6d8b717
2020-04-21Add RemoveAndroidCompatAnnotationsJarTransformer to JarJar. am: 05bc010f95 ↵android-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_r18android11-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-d2-releaseArtur Satayev
am: 2cbb48ea11 Change-Id: Icd9aaccda4be49803b7db2ef476b64f559d00189
2020-04-21[automerger skipped] Add RemoveAndroidCompatAnnotationsJarTransformer to ↵Artur Satayev
JarJar. am: 05bc010f95 am: 2cbb48ea11 -s ours am: 8315059a13 -s ours am skip reason: Change-Id Ic95dce29f81fe9ce80e607150f294d7e105d1abe with SHA-1 05bc010f95 is in history Change-Id: I3458e6379fd7c1e858fd133e47d508d4ea7d1fbd
2020-04-21[automerger skipped] Add RemoveAndroidCompatAnnotationsJarTransformer to ↵Artur Satayev
JarJar. am: 05bc010f95 am: 2cbb48ea11 -s ours am skip reason: Change-Id Ic95dce29f81fe9ce80e607150f294d7e105d1abe with SHA-1 05bc010f95 is in history Change-Id: If159db1f141e4e6e7d475feecb08b1d72dbac34e
2020-04-21[automerger skipped] Add RemoveAndroidCompatAnnotationsJarTransformer to ↵Artur Satayev
JarJar. am: 05bc010f95 -s ours am: 1799b58a27 -s ours am: 53c85f5841 -s ours am skip reason: Change-Id Ic95dce29f81fe9ce80e607150f294d7e105d1abe with SHA-1 0ecdee5310 is in history Change-Id: I77c01c3a5127ba34618cb71946938d6dd9941d0c
2020-04-21[automerger skipped] Add RemoveAndroidCompatAnnotationsJarTransformer to ↵Artur Satayev
JarJar. am: 05bc010f95 -s ours am: 1799b58a27 -s ours am skip reason: Change-Id Ic95dce29f81fe9ce80e607150f294d7e105d1abe with SHA-1 0ecdee5310 is in history Change-Id: Ic66a8d01ea8aae1fb32685687687a9c5a8be1eff
2020-04-21Add RemoveAndroidCompatAnnotationsJarTransformer to JarJar. am: 05bc010f95android-11.0.0_r16android11-d1-b-releaseArtur Satayev
Change-Id: Id22945f572a26f56819db71cc134154d239969ef
2020-04-21[automerger skipped] Add RemoveAndroidCompatAnnotationsJarTransformer to ↵Artur Satayev
JarJar. am: 05bc010f95 -s ours am skip reason: Change-Id Ic95dce29f81fe9ce80e607150f294d7e105d1abe with SHA-1 0ecdee5310 is in history Change-Id: I09020c2bd69accd87b9fab0c95924a66ff9167b4
2020-04-21Add RemoveAndroidCompatAnnotationsJarTransformer to JarJar.android11-devArtur Satayev
New transformer drops given annotations from classes that jarjar repackages. Dropped annotation, as of this change, includes "UnsupportedAppUsage". Greylisted APIs removed via this change should be safe for rvc, since they were added after Q aosp. Bug: 146418363 Test: m, diff hiddenapi-flags.csv Change-Id: Ic95dce29f81fe9ce80e607150f294d7e105d1abe Merged-In: Ic95dce29f81fe9ce80e607150f294d7e105d1abe Exempt-From-Owner-Approval: cherrypick from aosp (cherry picked from commit 0ecdee5310522cd1b04d2241b612aa9a5c100167)
2020-04-20Add RemoveAndroidCompatAnnotationsJarTransformer to JarJar. am: 0ecdee5310 ↵Artur Satayev
am: 78d3f714de am: 2a965ef23c am: 2e6d52a2cf am: 3f468d450f Change-Id: I2c534312955e7b3fbdddf6729709bf4c798a2514
2020-04-20Add RemoveAndroidCompatAnnotationsJarTransformer to JarJar. am: 0ecdee5310 ↵Artur Satayev
am: 78d3f714de am: 2a965ef23c am: 2e6d52a2cf am: 3f468d450f Change-Id: If17c1d9ebe58bc9e0055b48522dec49fa21dea2b
2020-04-20Add RemoveAndroidCompatAnnotationsJarTransformer to JarJar. am: 0ecdee5310 ↵Artur Satayev
am: 78d3f714de am: 2a965ef23c am: 2e6d52a2cf Change-Id: I36a272314ec92ec056149a5de6d586a401f0d464
2020-04-20Add RemoveAndroidCompatAnnotationsJarTransformer to JarJar. am: 0ecdee5310 ↵Artur Satayev
am: 78d3f714de am: 2a965ef23c Change-Id: I2962a133c1df1d6c5adf6ba7e4ac1c0d3e0f3128
2020-04-20Add RemoveAndroidCompatAnnotationsJarTransformer to JarJar. am: 0ecdee5310 ↵Artur Satayev
am: 78d3f714de Change-Id: Ied69e820de3814c66f593706409f8f572b48928f
2020-04-20Add RemoveAndroidCompatAnnotationsJarTransformer to JarJar. am: 0ecdee5310Artur Satayev
Change-Id: Ifced4e018b490f75d537a3536282469a32dcdc6f
2020-04-20Add RemoveAndroidCompatAnnotationsJarTransformer to JarJar.Artur Satayev
New transformer drops given annotations from classes that jarjar repackages. Dropped annotation, as of this change, includes "UnsupportedAppUsage". Greylisted APIs removed via this change should be safe for rvc, since they were added after Q aosp. Bug: 146418363 Test: m, diff hiddenapi-flags.csv Change-Id: Ic95dce29f81fe9ce80e607150f294d7e105d1abe
2019-07-03Fix include syntax on libcore/OWNERS file am: a695c456f9 am: c7b7c92bb9 am: ↵Neil Fuller
1bc9f06b19 am: d6f2742044 Change-Id: Icb8da3c2ceb1e9d80b06e921d12e104371d2d26c
2019-07-03Fix include syntax on libcore/OWNERS file am: a695c456f9 am: c7b7c92bb9android-r-preview-4android-r-preview-3android-r-preview-2android-r-preview-1android-mainline-10.0.0_r8android-mainline-10.0.0_r6android10-mainline-resolv-releaseandroid10-mainline-networking-releaseNeil Fuller
am: 1bc9f06b19 Change-Id: If812ed4fbd26bb2339790eaed2da0752943f403f
2019-07-03Fix include syntax on libcore/OWNERS file am: a695c456f9ndk-sysroot-r21Neil Fuller
am: c7b7c92bb9 Change-Id: Iaeba67f4c5d5f84e21dd5e89ceeb6dbb136a24ba
2019-07-03Fix include syntax on libcore/OWNERS fileNeil Fuller
am: a695c456f9 Change-Id: I95ddcd2ab3f794f408b774bb61f2aa4c8feff69f
2019-07-03Fix include syntax on libcore/OWNERS fileandroid-o-mr1-iot-release-1.0.14Neil Fuller
The syntax requires the project to be specified as a prefix. Change-Id: Idd19f7c29edd2bffc9bf3f46790fc85fcca55921 Exempt-From-Owner-Approval: Fixes OWNERS Test: None
2019-07-02Update OWNERS to reference libcore's OWNERS file am: 20d906719e am: ↵Neil Fuller
5067854e27 am: 24b1e6b908 am: 8579020c7f Change-Id: I863c74cce93415bafa768d07567e236042d75492
2019-07-02Update OWNERS to reference libcore's OWNERS file am: 20d906719e am: 5067854e27Neil Fuller
am: 24b1e6b908 Change-Id: I041c2deb61b5c0810555af4852a8c2dfb36795ee
2019-07-02Update OWNERS to reference libcore's OWNERS file am: 20d906719eNeil Fuller
am: 5067854e27 Change-Id: I0b8cd8e9bfbc252cdf9b8857f77b3d57cebc7cea
2019-07-02Update OWNERS to reference libcore's OWNERS fileNeil Fuller
am: 20d906719e Change-Id: I6f76c4923913f99284ae702d7f30e395365596de
2019-07-02Update OWNERS to reference libcore's OWNERS fileNeil Fuller
Update OWNERS to reference libcore's OWNERS file Test: ls ../../libcore/OWNERS Change-Id: I8c7ebc2ae1dad09c0a556b89312f0da107dee817
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: 9347fca999 -s ours am skip reason: subject contains skip directive Change-Id: Ib00a0dd0a4adcffc52780a3ffd1ac165adb818f1