summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-21Snap for 7160059 from 111c2bf71de448c63a79c2b031200ce372b13a66 to sc-d1-releaseandroid-12.0.0_r7android-12.0.0_r6android-12.0.0_r5android-12.0.0_r4android-12.0.0_r15android-12.0.0_r14android-12.0.0_r13android-12.0.0_r12android12-d1-s6-releaseandroid12-d1-s5-releaseandroid12-d1-s4-releaseandroid12-d1-s3-releaseandroid12-d1-s2-releaseandroid12-d1-s1-releaseandroid12-d1-releaseandroid-build-team Robot
Change-Id: Ie221dba33ab36e76ec0e8b6406bb24a8cc2f2817
2021-02-20[LSC] Add LOCAL_LICENSE_KINDS to prebuilts/manifest-merger am: e16bbe2588 ↵android-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-releaseBob Badour
am: 3c52d591be am: ea3a575cd1 Original change: https://android-review.googlesource.com/c/platform/prebuilts/manifest-merger/+/1588373 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6d8b37132af4e1d97aa2e990ce94f4c21455e9b8
2021-02-19[LSC] Add LOCAL_LICENSE_KINDS to prebuilts/manifest-merger am: e16bbe2588 ↵Bob Badour
am: 3c52d591be Original change: https://android-review.googlesource.com/c/platform/prebuilts/manifest-merger/+/1588373 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I340dcc42b377d2bc6c5acec813163784aa0d8002
2021-02-19[LSC] Add LOCAL_LICENSE_KINDS to prebuilts/manifest-merger am: e16bbe2588android-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/prebuilts/manifest-merger/+/1588373 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia87a0b84e03cf05bf6c7933c1c5d971b588358aa
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to prebuilts/manifest-mergerBob 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: Ie27091eee45079f40e0e9d54ccabedb37b15548b
2020-09-13Snap for 6830825 from af94a1c25317a125b341f869c4900990206fb88f to sc-d1-releaseandroid-build-team Robot
Change-Id: Idaa9991dc64c1b0eae861851d90df8bd0506b086
2020-09-11[automerger skipped] Merge Android R am: bc89ff52e5 -s ours am: 970a231764 ↵Xin Li
-s ours am: ba680f7a20 -s ours am: 41a9aef732 -s ours am: 8c968172f3 -s ours am: a9172992f0 -s ours am skip reason: Change-Id I1ae4134b93e99fc56cc0935e0e78df197e0d9487 with SHA-1 a7fa0bf870 is in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/manifest-merger/+/1422514 Change-Id: Ifecc2e2a507860b715e6e3585330fdfb3ec995c9
2020-09-11[automerger skipped] Merge Android R am: bc89ff52e5 -s ours am: 970a231764 ↵Xin Li
-s ours am: ba680f7a20 -s ours am: 41a9aef732 -s ours am: 8c968172f3 -s ours am skip reason: Change-Id I1ae4134b93e99fc56cc0935e0e78df197e0d9487 with SHA-1 a7fa0bf870 is in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/manifest-merger/+/1422514 Change-Id: I6a382def35aa1eb5230f7aad2d9ebd643ff75639
2020-09-11[automerger skipped] Merge Android R am: bc89ff52e5 -s ours am: 970a231764 ↵android-s-preview-1Xin Li
-s ours am: ba680f7a20 -s ours am: 41a9aef732 -s ours am skip reason: Change-Id I1ae4134b93e99fc56cc0935e0e78df197e0d9487 with SHA-1 a7fa0bf870 is in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/manifest-merger/+/1422514 Change-Id: I8f9a0c084b393445dc9dc8f617fd410bf4b742fa
2020-09-11[automerger skipped] Merge Android R am: bc89ff52e5 -s ours am: 970a231764 ↵Xin Li
-s ours am: ba680f7a20 -s ours am skip reason: Change-Id I1ae4134b93e99fc56cc0935e0e78df197e0d9487 with SHA-1 a7fa0bf870 is in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/manifest-merger/+/1422514 Change-Id: I4230b2f99e72e02b6f1664c86aab74224929e726
2020-09-11[automerger skipped] Merge Android R am: bc89ff52e5 -s ours am: 970a231764 ↵Xin Li
-s ours am skip reason: Change-Id I1ae4134b93e99fc56cc0935e0e78df197e0d9487 with SHA-1 a7fa0bf870 is in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/manifest-merger/+/1422514 Change-Id: Ie2ff90ed17c1ef395ce8fc75a98cf4397d03ad4e
2020-09-11[automerger skipped] Merge Android R am: bc89ff52e5 -s oursXin Li
am skip reason: Change-Id I1ae4134b93e99fc56cc0935e0e78df197e0d9487 with SHA-1 a7fa0bf870 is in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/manifest-merger/+/1422514 Change-Id: I7201317de62879c4c92231eaa7defa48819784db
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: I1ae4134b93e99fc56cc0935e0e78df197e0d9487 Change-Id: Id386426fcb199ada5a43cdff8fe47a3a40fbd47f
2020-09-03Snap for 6810044 from 1cf4cf4bee18c8a39cd83efca96921ea1f87325c to sc-d1-releaseandroid-build-team Robot
Change-Id: Ieac408f4518b0338309109aeb9437319d04fa930
2020-09-02[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: a7fa0bf870 -s ours am: 8bac6b97c4 -s ours am: 2f5f6ede49 -s ours am: 4c93650f42 -s ours am: 5c2c6f4e07 -s ours am skip reason: Change-Id I1e54186afca0843a1607b33465c37aece62f4522 with SHA-1 3b9fc994c7 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/manifest-merger/+/12470342 Change-Id: Ie53643c96d7de5d35cd4df13176a76687842d61d
2020-09-02[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: a7fa0bf870 -s ours am: 8bac6b97c4 -s ours am: 2f5f6ede49 -s ours am: 4c93650f42 -s ours am skip reason: Change-Id I1e54186afca0843a1607b33465c37aece62f4522 with SHA-1 3b9fc994c7 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/manifest-merger/+/12470342 Change-Id: Ic62658d00589485f1e678ab372676275e88d68e2
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: a7fa0bf870 -s ours am: 8bac6b97c4 -s ours am: 2f5f6ede49 -s ours am skip reason: Change-Id I1e54186afca0843a1607b33465c37aece62f4522 with SHA-1 3b9fc994c7 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/manifest-merger/+/12470342 Change-Id: Id9046c05038cfaf901c413aec50e9ba1c6781ba4
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: a7fa0bf870 -s ours am: 8bac6b97c4 -s ours am skip reason: Change-Id I1e54186afca0843a1607b33465c37aece62f4522 with SHA-1 3b9fc994c7 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/manifest-merger/+/12470342 Change-Id: Id5a9c1dcd94696fe1871407bab597ffa2401cebb
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: a7fa0bf870 -s ours am skip reason: Change-Id I1e54186afca0843a1607b33465c37aece62f4522 with SHA-1 3b9fc994c7 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/manifest-merger/+/12470342 Change-Id: I4f4c42ef15e5f5807b0974141a545cf40ace2132
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: I1e54186afca0843a1607b33465c37aece62f4522 Change-Id: I1ae4134b93e99fc56cc0935e0e78df197e0d9487
2019-08-13Manually update manifest merger using gmaven_repo from ab/5794003r_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-releaseColin Cross
Bug: 139128472 Test: m checkbuild Change-Id: I1e54186afca0843a1607b33465c37aece62f4522
2019-03-04Add manifest-merger module am: 435f021d98 am: 25de7bcfa6q_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-4android-r-preview-3android-r-preview-2android-r-preview-1android-r-beta-3android-r-beta-2android-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-releaseColin Cross
am: 11382bfe70 Change-Id: I86b13e45a4d627c5e80cc7d7679154ac5d6b69d6
2019-03-04Add manifest-merger module am: 435f021d98Colin Cross
am: 25de7bcfa6 Change-Id: I75e1c8440865685327db1bdd9991ac3748c9e2c8
2019-03-04Add manifest-merger moduleColin Cross
am: 435f021d98 Change-Id: I2a23c59c30a7fe06935f9a4e8004015c012f9eb3
2019-03-01Add manifest-merger moduleandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1Colin Cross
Add a manifest-merger java_binary_host module to build a self contained binary for running manifest-merger. Bug: 112607039 Test: m checkbuild Change-Id: I2f9e1778b61099710d6b22b88692fa5f965061a4
2019-02-28Update manifest merger to 26.4.0-beta05 am: 822a1075c3 am: bba196045aColin Cross
am: 0ea3bd9350 Change-Id: Ifd74c058e6d6d3a91ac7973810a5c4fcc95a982c
2019-02-28Update manifest merger to 26.4.0-beta05 am: 822a1075c3Colin Cross
am: bba196045a Change-Id: I59d648459c5ecbb3766f191c529437a6486e18e7
2019-02-28Update manifest merger to 26.4.0-beta05Colin Cross
am: 822a1075c3 Change-Id: Icba5fdf7db4d43a6217e3b1a82f5b796a71684cf
2019-02-28Update manifest merger to 26.4.0-beta05Colin Cross
Generated with: rm -rf com/android JAVA_HOME=$ANDROID_BUILD_TOP/prebuilts/jdk/jdk8/linux-x86/ \ ./import-maven-artifacts.sh com.android.tools.build:manifest-merger:26.4.0-beta05 Bug: 112607039 Test: m checkbuild Change-Id: Iefb0d57a75c7df5ef8746e77751a91f730fec832
2019-02-27Add script to import manifest merger artifacts am: e57360b1b2 am: 34b478f616Colin Cross
am: 080bb5acdb Change-Id: I01d5aefa6f8c9e5ef45bb670f4aa7f64b96b6901
2019-02-27Add script to import manifest merger artifacts am: e57360b1b2Colin Cross
am: 34b478f616 Change-Id: Icc3205437ec7af54e6015f5cd946c5b1cc37ca4a
2019-02-27Add script to import manifest merger artifactsColin Cross
am: e57360b1b2 Change-Id: If34541bcbaf76f8571681805220ba051c54a565d
2019-02-27Add script to import manifest merger artifactsColin Cross
Add a copy of prebuilts/tools/import-maven-artifacts.sh customized to import into prebuilts/manifest-merger and to only copy artifacts in com.android.* packages. Test: JAVA_HOME=$ANDROID_BUILD_TOP/prebuilts/jdk/jdk8/linux-x86/ \ ./import-maven-artifacts.sh com.android.tools.build:manifest-merger:26.4.0-beta05 Change-Id: I035664f433fac7d41d71a905e470c98381549cea
2019-02-22Initial empty repositoryInna Palant
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-15 20:21:20 +0000