aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to sdk" am: 6e37a45f64 am: 34fe745f42 ↵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-releaseTreehugger Robot
am: fc7153a807 Original change: https://android-review.googlesource.com/c/platform/sdk/+/1589083 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2b801c6244b415a543b09d4c2c021637cfe04391
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to sdk" am: 6e37a45f64 am: 34fe745f42Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/sdk/+/1589083 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib240d48daf3bf658339841c6d8a71b749da4d14b
2021-02-15Merge "[LSC] Add LOCAL_LICENSE_KINDS to sdk" am: 6e37a45f64android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/sdk/+/1589083 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7513c7aa6f0f806ec744c2ecdb65f2318f743679
2021-02-15Merge "[LSC] Add LOCAL_LICENSE_KINDS to sdk"android-s-preview-1Treehugger Robot
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to sdkBob Badour
Added SPDX-license-identifier-Apache-2.0 to: annotations/Android.bp dumpeventlog/Android.bp eventanalyzer/Android.bp hierarchyviewer/Android.bp hierarchyviewer/etc/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: If52b586f5ea93255c9e70d3b70d10a8796ac11c2
2020-05-08Merge "Remove all non-Apache2 licensed files from sdk" am: 106d12a4f8 am: ↵Treehugger Robot
7cb6fc634a am: ccad5384d7 am: 18c1c14ad4 am: 46a5c62c67 Change-Id: Ib5a1e041abdbd5696d1b4467fa1581ae5d9c344c
2020-05-08Merge "Remove all non-Apache2 licensed files from sdk" am: 106d12a4f8 am: ↵Treehugger Robot
7cb6fc634a am: ccad5384d7 am: 18c1c14ad4 Change-Id: I083d95ce5c952b8709b14d03279ed03913cb488f
2020-05-08Merge "Remove all non-Apache2 licensed files from sdk" am: 106d12a4f8 am: ↵Treehugger Robot
7cb6fc634a am: ccad5384d7 Change-Id: Iaaff1e1152ae574f85e78797ecb849e29c805ef8
2020-05-08Merge "Remove all non-Apache2 licensed files from sdk" am: 106d12a4f8 am: ↵Treehugger Robot
7cb6fc634a Change-Id: I0fc20e72e7edfc5daf2068bf0aa6ea25ddb4a1c9
2020-05-08Merge "Remove all non-Apache2 licensed files from sdk" am: 106d12a4f8android-r-beta-3android-r-beta-2Treehugger Robot
Change-Id: I89177e37d0cc6ce6598248d84ef22030338ddb0c
2020-05-08Merge "Remove all non-Apache2 licensed files from sdk"Treehugger Robot
2020-05-06Remove all non-Apache2 licensed files from sdkBob Badour
Remove MODULE_LICENSE_APACHE2 Repositories containing third-party code need a METADATA and a license_type. Repositories containing only first-party code no longer need a MODULE_LICENSE_* file. Remove EPL-licensed eclipse plugin and attribute_stats. Remove CC-BY-SA licensed typos files. Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: treehugger Test: https://android-build.googleplex.com/builds/forrest/run/L63500000550775268 Exempt-From-Owner-Approval: janitorial work Change-Id: I5fafa76de21fb0b46c82a2c07ac048afbee3df25
2020-05-06Merge "Revert "Remove unused project."" am: fc7cda06f5 am: d3c69fa48e am: ↵Bob Badour
d58f8ba3b1 am: f1a59c9833 am: 9d23b89ef1 Change-Id: I463b8ee72ee68d390c4398e5287b6d1003197939
2020-05-06Merge "Revert "Remove unused project."" am: fc7cda06f5 am: d3c69fa48e am: ↵Bob Badour
d58f8ba3b1 am: f1a59c9833 Change-Id: I0d3fb69b92ad417802dd038bdf989a6b84cfc210
2020-05-06Merge "Revert "Remove unused project."" am: fc7cda06f5 am: d3c69fa48e am: ↵Bob Badour
d58f8ba3b1 Change-Id: I297730ce4f9da2bf30dde696439ab825cd642b00
2020-05-06Merge "Revert "Remove unused project."" am: fc7cda06f5 am: d3c69fa48eBob Badour
Change-Id: I2920d1fca1593e86805ec8a728121cf2513e2bc5
2020-05-06Merge "Revert "Remove unused project."" am: fc7cda06f5Bob Badour
Change-Id: I1dbd864aa8ee9e2a44b6acc173c12740abf9447f
2020-05-06Merge "Revert "Remove unused project.""Bob Badour
2020-05-06Revert "Remove unused project."Paul Duffin
This reverts commit eaada771a6e62ca494a625ce1b060f1a94fa9877. Reason for revert: Breaks build_test and other builds Bug: 155862492 Change-Id: I1a14b84d54b05596ec250b31ae56e437cf49fd81
2020-05-06Merge "Remove unused project." am: 1aa104fb55 am: 0300bcd44e am: e36f051d41 ↵Treehugger Robot
am: 14a008655d am: a4cd7aaab7 Change-Id: Ib3ba18b7f4f2cffa0ca2f17eaae1801ee3cca906
2020-05-06Merge "Remove unused project." am: 1aa104fb55 am: 0300bcd44e am: e36f051d41 ↵Treehugger Robot
am: 14a008655d Change-Id: I03a76901da83c5a21edaa5a00cf5c31a677d9b5f
2020-05-06Merge "Remove unused project." am: 1aa104fb55 am: 0300bcd44e am: e36f051d41Treehugger Robot
Change-Id: I530ec2fa2142d451518127ddc00536024d871eed
2020-05-06Merge "Remove unused project." am: 1aa104fb55 am: 0300bcd44eTreehugger Robot
Change-Id: I3d51b5c9a138057e41e8d90574fc2afb37d98390
2020-05-06Merge "Remove unused project." am: 1aa104fb55Treehugger Robot
Change-Id: I8c8344b89598c084293a180a4638817a3a7474f3
2020-05-06Merge "Remove unused project."Treehugger Robot
2020-05-05Remove unused project.Bob Badour
Remove the source and switch the OWNERS to the janitors to prevent necromancy. Test: treehugger Change-Id: I85d58aafad17c65d7d2963c99409dddf8888fb16
2019-10-30[automerger skipped] DO NOT MERGE - ↵r_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-releaseXin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 3bbeaa3d26 am: b0dcd4a2c7 -s ours am skip reason: subject contains skip directive Change-Id: I8d76a8e22b1035c8dbac6eef7d4d9935b909c796
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-4android-r-preview-3android-r-preview-2Xin Li
stage-aosp-master am: 3bbeaa3d26 Change-Id: Id2594c8f41a6fc0d75b290e83c6e9b23d9b4a43f
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-1Xin Li
stage-aosp-master Bug: 142003500 Change-Id: I190b6dcea3636b7e3150597b51dfc6fb7d6400ad
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: afc87d309e -s ours am: 3ec3e42074 -s ours am: e2c68225d7 -s ours am skip reason: change_id Ief1c0eaed98d2a196bca066bfeb83a16e4410887 with SHA1 6a0bd8fd7b is in history Change-Id: I066134470e8f5a81206ee7dda9849b68f5884810
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: afc87d309e -s ours am: 3ec3e42074 -s ours am skip reason: change_id Ief1c0eaed98d2a196bca066bfeb83a16e4410887 with SHA1 6a0bd8fd7b is in history Change-Id: I1d28b9a7ed52a28309afa14dc5be11dfbca63b55
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: afc87d309e -s ours am skip reason: change_id Ief1c0eaed98d2a196bca066bfeb83a16e4410887 with SHA1 6a0bd8fd7b is in history Change-Id: I89aeb717d28b63ce9da3528bc332cf870d925625
2019-09-08Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li
No content change. Bug: 135460123 Change-Id: I12f3a96cef381aa90bb14fbd7188aa78872735bc Merged-In: Ief1c0eaed98d2a196bca066bfeb83a16e4410887
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
4546008f8a -s ours am: 9826b300bd am: cc12a61f80 am: b26585aa03 -s ours am skip reason: subject contains skip directive Change-Id: Ifbc2f974ee317ae1545aac592e291ca24ec554e9
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
4546008f8a -s ours am: 9826b300bd am: cc12a61f80 Change-Id: I76d0de347c4214930abb083c90d09df37a533f02
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
4546008f8a -s ours am: 9826b300bd Change-Id: I26b03d764729338bc8debaa18997e97d0a5bd103
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"Xin Li
am: 4546008f8a -s ours am skip reason: subject contains skip directive Change-Id: Ibae9702dd7e31c6c2252ca03775ab89e0181e05a
2019-09-05Merge "DO NOT MERGE - Merge Android 10 into master"ndk-sysroot-r21Xin Li
2019-09-04DO NOT MERGE - Merge Android 10 into masterXin Li
Bug: 139893257 Change-Id: Ief1c0eaed98d2a196bca066bfeb83a16e4410887
2019-07-02[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor ↵Xin Li
(5699924) into stage-aosp-master am: 6cecbeb0e6 am: 55ec1ad79d -s ours am skip reason: subject contains skip directive Change-Id: Id8fd2a539d982c3b8b015ac969f38f56858e56df
2019-07-02DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵Xin Li
stage-aosp-master am: 6cecbeb0e6 Change-Id: I64ed07901f67140d56cf289d5099119a1c80f76f
2019-07-01DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵temp_140451723Xin Li
stage-aosp-master Bug: 134405016 Change-Id: I130755338d20497a5c12e453a0b6f49a6908236f
2019-05-13Merge changes Ia74dd04d,Ib6a6d3fe am: 6590b8f4bb am: 7a2519030aDan Willemsen
am: 72062f2941 Change-Id: I415a105080c5c7ab2b8474e1707d9e91550827ed
2019-05-13Merge changes Ia74dd04d,Ib6a6d3fe am: 6590b8f4bbDan Willemsen
am: 7a2519030a Change-Id: I82e1ff121681acbe225e45967b7e46a8bd0146ef
2019-05-13Merge changes Ia74dd04d,Ib6a6d3feandroid-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Dan Willemsen
am: 6590b8f4bb Change-Id: I7aaa087ebaac6a8ea1f8d6ca778263e6531cc59e
2019-05-13Merge changes Ia74dd04d,Ib6a6d3feTreehugger Robot
* changes: Convert to Android.bp Remove mksdcard from the System source tree
2019-05-11Convert to Android.bpDan Willemsen
See build/soong/README.md for more information. Bug: 122333025 Test: cd sdk; mma Change-Id: Ia74dd04d0cd97aea4374d4e0b8461d3e50d1ac9e
2019-05-10Remove mksdcard from the System source treeJim Kaye
The live version is in aosp/emu-master-dev under sdk/emulator/ Bug: 113514423 Test: None Change-Id: Ib6a6d3fe79d434d3c76a969049c7e212f309b29b Merged-In: Ib6a6d3fe79d434d3c76a969049c7e212f309b29b (cherry picked from commit 131905021f2df34096124c0f93eecc311a60f56d)
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: b6368bc7f9 Change-Id: If2cbff6c6dc53a5e40f20067bdcb4b60febf49aa
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: Ie2c4de3bfb8fc462367328da788d6f9461ac542b
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-11 19:33:42 +0000