aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-06-02Merge sc-mainline-prodt_frc_tz4_330443010t_frc_swc_330443040t_frc_swc_330443010t_frc_sta_330443010t_frc_sch_330443040t_frc_sch_330443010t_frc_res_330443000t_frc_per_330444010t_frc_odp_330442040t_frc_odp_330442000t_frc_neu_330443030t_frc_neu_330443000t_frc_net_330443000t_frc_med_330443030t_frc_ips_330443010t_frc_ext_330443000t_frc_doc_330543000t_frc_doc_330443060t_frc_doc_330443000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060t_frc_adb_330444000android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r55android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_go_wif_330911000aml_go_uwb_330912000aml_go_tz4_330912000aml_go_tet_330914010aml_go_swc_330913000aml_go_sta_330911000aml_go_sdk_330810000aml_go_sch_330911000aml_go_res_330912000aml_go_per_330912000aml_go_odp_330913000aml_go_odp_330912000aml_go_neu_330912000aml_go_net_330913000aml_go_mpr_330912000aml_go_med_330913000aml_go_ips_330911000aml_go_ext_330912000aml_go_doc_330912000aml_go_con_330913000aml_go_cbr_330912000aml_go_ase_330913000aml_go_art_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-releaseandroid13-mainline-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-go-wifi-releaseandroid13-mainline-go-uwb-releaseandroid13-mainline-go-tzdata4-releaseandroid13-mainline-go-tethering-releaseandroid13-mainline-go-sdkext-releaseandroid13-mainline-go-scheduling-releaseandroid13-mainline-go-resolv-releaseandroid13-mainline-go-permission-releaseandroid13-mainline-go-os-statsd-releaseandroid13-mainline-go-odp-releaseandroid13-mainline-go-neuralnetworks-releaseandroid13-mainline-go-networking-releaseandroid13-mainline-go-mediaprovider-releaseandroid13-mainline-go-media-swcodec-releaseandroid13-mainline-go-media-releaseandroid13-mainline-go-ipsec-releaseandroid13-mainline-go-extservices-releaseandroid13-mainline-go-documentsui-releaseandroid13-mainline-go-conscrypt-releaseandroid13-mainline-go-cellbroadcast-releaseandroid13-mainline-go-art-releaseandroid13-mainline-go-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adservices-releaseandroid13-frc-scheduling-releaseandroid13-frc-resolv-releaseandroid13-frc-permission-releaseandroid13-frc-os-statsd-releaseandroid13-frc-odp-releaseandroid13-frc-neuralnetworks-releaseandroid13-frc-networking-releaseandroid13-frc-media-swcodec-releaseandroid13-frc-media-releaseandroid13-frc-ipsec-releaseandroid13-frc-extservices-releaseandroid13-frc-documentsui-releaseandroid13-frc-conscrypt-releaseandroid13-frc-cellbroadcast-releaseandroid13-frc-art-releaseandroid13-frc-adbd-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseaml_tz4_332714010Xin Li
Bug: 189946434 Change-Id: I2b95b88fe172fca1894a5f82f1df909cf5830f37
2021-02-21[LSC] Add LOCAL_LICENSE_KINDS to external/python/apitools am: a57fcf537a am: ↵android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-releaseBob Badour
26525b9a61 am: 1ec66511e5 am: ae7044d9b1 Original change: https://android-review.googlesource.com/c/platform/external/python/apitools/+/1588604 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6ba6d49ede368cda9adde7cf28b793a54356111a
2021-02-21[LSC] Add LOCAL_LICENSE_KINDS to external/python/apitools am: a57fcf537a am: ↵Bob Badour
26525b9a61 am: 1ec66511e5 am: ae7044d9b1 Original change: https://android-review.googlesource.com/c/platform/external/python/apitools/+/1588604 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib58e267a0cc41a483535ead84da89d520dbb2a64
2021-02-21[LSC] Add LOCAL_LICENSE_KINDS to external/python/apitools am: a57fcf537a am: ↵android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-3android-s-v2-beta-2android-s-qpr3-beta-1android-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-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Bob Badour
26525b9a61 am: 1ec66511e5 Original change: https://android-review.googlesource.com/c/platform/external/python/apitools/+/1588604 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2e1792a6f12898d2cc914110107b8a46b0fd2615
2021-02-19[LSC] Add LOCAL_LICENSE_KINDS to external/python/apitools am: a57fcf537a am: ↵Bob Badour
26525b9a61 Original change: https://android-review.googlesource.com/c/platform/external/python/apitools/+/1588604 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifbe46af0b68054bc3ca114c3d031a087df5666be
2021-02-19[LSC] Add LOCAL_LICENSE_KINDS to external/python/apitools am: a57fcf537aandroid-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/python/apitools/+/1588604 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7ae6f2fca5d10b99482e6749cefee4bbc2ccac31
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/python/apitoolsBob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp apitools/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I2e5d8bebbfecd653f0d8f0646d63397e5bf42185
2021-01-14Remove test mapping file for acloud_test am: c4a00e1c1e am: c5af9af216 am: ↵Julien Desprez
8c9f69e4ed Original change: https://android-review.googlesource.com/c/platform/external/python/apitools/+/1549578 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0d2233f8c6725d38ddd76d6b1432414d09e528a8
2021-01-13Remove test mapping file for acloud_test am: c4a00e1c1e am: c5af9af216Julien Desprez
Original change: https://android-review.googlesource.com/c/platform/external/python/apitools/+/1549578 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I82ad818e23c790ef561c192d3fedf415e4f25834
2021-01-13Remove test mapping file for acloud_test am: c4a00e1c1eJulien Desprez
Original change: https://android-review.googlesource.com/c/platform/external/python/apitools/+/1549578 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic60e587eb75549b5465fbd1b29081e8815e71c01
2021-01-13Remove test mapping file for acloud_testandroid-s-preview-1Julien Desprez
Not needed anymore. Exempt-From-Owner-Approval:clean up mapping files Test: presubmit Bug: 175408655 Change-Id: I7bf531c6c8c4bcc0329f6cb0e31f5469e6d5dfc0
2020-05-15Upgrade python/apitools to v0.5.31 am: f864ef688b am: 9b6a69032d am: ↵Haibo Huang
89ea80b037 am: 4044c97a7e am: 70045997c5 Change-Id: Ib88eb589d1ef3ff2847525d19fc88c4157ef55c4
2020-05-15Upgrade python/apitools to v0.5.31 am: f864ef688b am: 9b6a69032d am: ↵Haibo Huang
89ea80b037 am: 4044c97a7e Change-Id: If161fd1b4d56e4673ae18c49c606c9ea131b411a
2020-05-15Upgrade python/apitools to v0.5.31 am: f864ef688b am: 9b6a69032d am: 89ea80b037Haibo Huang
Change-Id: I8dbb44ff2341be18d30fbb0bff4356e792da1dd7
2020-05-15Upgrade python/apitools to v0.5.31 am: f864ef688b am: 9b6a69032dHaibo Huang
Change-Id: I01049c5595f0c90a2a92f05eb0cc7390f34f06fb
2020-05-15Upgrade python/apitools to v0.5.31 am: f864ef688bandroid-r-beta-3android-r-beta-2Haibo Huang
Change-Id: Ie93394dd47e11e993bdd34d47c3d0cfa3fccc0e9
2020-05-15Upgrade python/apitools to v0.5.31Haibo Huang
Exempt-From-Owner-Approval: Change-Id: I87e804ff19a93d51d6244f834bceebc32536801e
2020-05-14Update apitools version to 0.5.31.James Lynn Wu
2020-05-14Add compatibility with httplib2 0.16.0+ (#295)ejochman
See more at googleapis/google-api-python-client#803. Fix applied as recommended in https://github.com/googleapis/google-api-python-client/issues/803#issuecomment-578151576
2020-04-24Add license type: Apache2 is a NOTICE license am: 39de3b544a am: 7795a04748 ↵Bob Badour
am: 8d98187fab am: 0bc2bcb47b am: 2968129502 Change-Id: Ib74ec6315318f84ec001a033d1b3ffa1a945cf21
2020-04-24Add license type: Apache2 is a NOTICE license am: 39de3b544a am: 7795a04748 ↵Bob Badour
am: 8d98187fab am: 0bc2bcb47b Change-Id: I05d810bb365804b4e7114204eaaebf95327dd829
2020-04-24Add license type: Apache2 is a NOTICE license am: 39de3b544a am: 7795a04748 ↵Bob Badour
am: 8d98187fab Change-Id: I82001173c63066f49f58b1c50e243d66123cc2a9
2020-04-24Add license type: Apache2 is a NOTICE license am: 39de3b544a am: 7795a04748Bob Badour
Change-Id: I414402990034857798d7aba99ce3cd2ddebf4f24
2020-04-24Add license type: Apache2 is a NOTICE license am: 39de3b544aBob Badour
Change-Id: Id6285b24f68cd59e5e0c4e8d33e79c7be86df791
2020-04-23Add license type: Apache2 is a NOTICE licenseBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: Iefb77e51b1b43343f7c456f7ac2868cef3b957ad
2020-04-20Use == instead of is to compare stringsJames Lynn Wu
2020-04-20Update util.pyJames Lynn Wu
Include exec as a keyword. exec is no longer a keyword. https://docs.python.org/3/whatsnew/3.0.html#removed-syntax
2020-04-17Remove unittest2 from tox.ini (#293)James Lynn Wu
2020-04-14Remove unittest2 from tox.ini (#291)James Lynn Wu
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: f97984319e -s ours am: 8524249f4a am: ccb0b98c85 am: ab0f0101d9 -s ours am skip reason: subject contains skip directive Change-Id: Id4ce5c49740a2cdd88e60f6957c2a986b68e295b
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: f97984319e -s ours am: 8524249f4a am: ccb0b98c85 Change-Id: I96c57ccf6d94bb5d232986498399bbc39b8e40b1
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: f97984319e -s ours am: 8524249f4a Change-Id: Ied7a97a54eb4390d37ac6ecc85a604ae4bd84cbd
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: f97984319e -s ours am skip reason: subject contains skip directive Change-Id: I2146a364b3b0977d30e4e468643d04b8480a2437
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I7ee566c34ae9d6123b18cb8288f8365ebb4e077c
2020-04-09Drop support for EOL Python versions (#265)Hugo van Kemenade
* Drop support for EOL Python versions * sudo no longer needed https://blog.travis-ci.com/2018-11-19-required-linux-infrastructure-migration * Remove unittest2 dependency * Add python_requires and Trove classifiers * Replace unittest2 with unittest
2020-03-26Merge "Remove redundant NOTICE symbolic link." am: c2eb0e9f97 am: a3f5337566 ↵Treehugger Robot
am: 9f009ff4e7 am: 4254097c9b am: 0ce78d782f Change-Id: I076b6c6a5d1587df39269f77028759072ee8f81b
2020-03-26Merge "Remove redundant NOTICE symbolic link." am: c2eb0e9f97 am: a3f5337566 ↵Treehugger Robot
am: 9f009ff4e7 am: 4254097c9b Change-Id: I10a4690d3aa3151646398c4994cb034e272b51e0
2020-03-26Merge "Remove redundant NOTICE symbolic link." am: c2eb0e9f97 am: a3f5337566 ↵Treehugger Robot
am: 9f009ff4e7 Change-Id: I4073d371403728ecafd4e800b36acb772d31d646
2020-03-26Merge "Remove redundant NOTICE symbolic link." am: c2eb0e9f97 am: a3f5337566Treehugger Robot
Change-Id: I8391c77c52daaad70c1bcefab31970d6aa5d4b5c
2020-03-26Merge "Remove redundant NOTICE symbolic link." am: c2eb0e9f97 am: a3f5337566Treehugger Robot
Change-Id: I72e14b6a334b3fa6227df57fc6c5f15d05e67570
2020-03-26Merge "Remove redundant NOTICE symbolic link." am: c2eb0e9f97Treehugger Robot
Change-Id: I18a47d1e21b365085d1400e7547018649d972c26
2020-03-26Merge "Remove redundant NOTICE symbolic link."Treehugger Robot
2020-03-26Remove redundant NOTICE copied from LICENSE. am: be365aacca am: b38fbdc93c ↵Bob Badour
am: ac517f5b1b am: 44c04d07a6 am: ba352f27c3 Change-Id: Ifd3dc6bde8b56150c59fce5ab5eec21f3adbe231
2020-03-26Remove redundant NOTICE copied from LICENSE. am: be365aacca am: b38fbdc93c ↵Bob Badour
am: ac517f5b1b am: 44c04d07a6 Change-Id: I521913b3203c3759ddbdeab1857bba460b3ee4f2
2020-03-26Remove redundant NOTICE copied from LICENSE. am: be365aacca am: b38fbdc93c ↵Bob Badour
am: ac517f5b1b Change-Id: I80ec4bbe2a927e8fb9dcb69e346e4f80c035ba2a
2020-03-26Remove redundant NOTICE copied from LICENSE. am: be365aacca am: b38fbdc93cBob Badour
Change-Id: I249f513ef85f980599b6738417002cc73247d60a
2020-03-26Remove redundant NOTICE copied from LICENSE. am: be365aacca am: b38fbdc93cBob Badour
Change-Id: Iea2ea7fd91e1e3d87e26a77ab40541cd3362b8cc
2020-03-26Remove redundant NOTICE copied from LICENSE. am: be365aaccaBob Badour
Change-Id: I1de5ac749d9493b6a999932314e330f6a703563e
2020-03-25Remove redundant NOTICE copied from LICENSE.Bob Badour
Identified using the below shell script: $ find -H . -name LICENSE -type f -print0 | xargs -0 dirname \ | while read dir; do \ if [ -f "${dir}/NOTICE" ] \ && diff "${dir}/LICENSE" "${dir}/NOTICE" >/dev/null; then \ echo "${dir}/NOTICE"; \ fi; \ done Now that http://r.android.com/r/1235427 and http://r.android.com/r/1238719 are merged, LICENSE files copied into NOTICE files are no longer needed. Bug: 67772237 Bug: 68860345 Test: manually built and diffed before and after system image notices Change-Id: Ib4237ee7d5472351c9a9faeb67911f7e96ba945b
2020-03-25Remove redundant NOTICE symbolic link.Bob Badour
Now that http://aosp/1235427 and http://aosp/1238719 are in, NOTICE symbolic links are no longer needed. Bug: 67772237 Bug: 68860345 Test: manually built and diffed before and after system image notices Change-Id: Idd494cc490aff1b5ad49ee8100906b7cb68f060f