aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-05-13Set min_sdk_version to be part of mainline modules am: 1d42a459b2android-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-releaseJooyung Han
Change-Id: I7dbf51c1af84b4fe5a34bf38a7667c9470b1841c
2020-05-13Set min_sdk_version to be part of mainline modulesandroid11-devJooyung Han
Modules contributing mainline modules (APK/APEX) should set min_sdk_version as well as apex_available. For now setting min_sdk_version doesn't change build outputs. But build-time checks will be added soon. (While cherry-picking, s/29/apex_inherit) Bug: 152655956 Test: m Merged-In: I90e135617642c87ecff517a17120285d8355827e Change-Id: I90e135617642c87ecff517a17120285d8355827e (cherry picked from commit 6732ec8048569ddc4b2a3d18b1c42dabfa7ad4bc)
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospq_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-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-releaseXin Li
am: 189c77357a Change-Id: I3f3d8e69b051b30c6f4de170580e14e429dfcadd
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: Iea9d88edb8a913de6154c7637a721d5bcb737f79
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Xin Li
Bug: 120848293 Change-Id: I3dd7fcb8988c34ccc5130e743604a7eb43bbd945
2019-01-22Merge "Add default code reviewers into OWNERS" am: b5e5ae2801 am: 020c6af90eChih-hung Hsieh
am: f79d1e2f5c Change-Id: Id3fb924240f3ca3fd3533dc087373f01ac889e45
2019-01-22Merge "Add default code reviewers into OWNERS" am: b5e5ae2801Chih-hung Hsieh
am: 020c6af90e Change-Id: I59602def23f941df7181475989c95419e98ff361
2019-01-22Merge "Add default code reviewers into OWNERS"Chih-hung Hsieh
am: b5e5ae2801 Change-Id: Ib9e85dc97cf34260ad8d996675947ec2265ea679
2019-01-22Merge "Add default code reviewers into OWNERS"android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-releaseChih-hung Hsieh
2019-01-22Add default code reviewers into OWNERSChih-Hung Hsieh
Bug: 33166666 Test: gerrit uploader Change-Id: If0ce4d4f90335a84af89683538fa03b9c0745444
2018-12-10[automerger skipped] Merge "DO NOT MERGE" am: c7af9eaf53 -s ours am: ↵Xin Li
2efb5f01d0 -s ours am: 419794b97b -s ours Change-Id: I9996cdee37b06a5e403c5968f02e0d5c8033cfa3
2018-12-10[automerger skipped] Merge "DO NOT MERGE" am: c7af9eaf53 -s oursXin Li
am: 2efb5f01d0 -s ours Change-Id: Id087a8789555f2053ba65d0d11fef0f5845edd09
2018-12-10[automerger skipped] Merge "DO NOT MERGE"Xin Li
am: c7af9eaf53 -s ours Change-Id: I2c863733eb711ca63e0c1c0ec7d1397495962bba
2018-12-10Merge "DO NOT MERGE"android-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7Treehugger Robot
2018-12-07DO NOT MERGEXin Li
Merge pie-platform-release (PPRL.181205.001, history only) into master Bug: 120502534 Change-Id: I657b53f5f434191436b4725e1128cc10b7dcfece
2018-12-04Merge "Upgrade libgsm to 1.0.18" am: f2041b96dc am: 1fce22af50Haibo Huang
am: 195897530d Change-Id: I2cb0422d54be0d6d9f14e98eef447f44a39d2785
2018-12-04Merge "Upgrade libgsm to 1.0.18" am: f2041b96dcHaibo Huang
am: 1fce22af50 Change-Id: I175fe49c3f48e73372b94017a0bc408654a81c60
2018-12-04Merge "Upgrade libgsm to 1.0.18"Haibo Huang
am: f2041b96dc Change-Id: I1a29726fbf21167b49b8c5261494f7b05bb50dc1
2018-12-05Merge "Upgrade libgsm to 1.0.18"android-wear-8.0.0_r2Treehugger Robot
2018-12-04Upgrade libgsm to 1.0.18Haibo Huang
Test: compile Change-Id: I210b10ca56af2df470f4ca99742d40c487d72d52
2017-12-11Snap for 4496165 from e775ffccfbedc4bb525cb2b5c9280a1dd0cfbe21 to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-releaseandroid-build-team Robot
Change-Id: I81d189d6a3733107a7d4c4746aa9ca9b2b79197c
2017-12-08Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 322a1f7ce1 -s ours am: ↵android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3android-n-iot-release-ihome-igv1android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devoreo-mr1-1.2-iot-releasenougat-iot-releasemaster-cuttlefish-testing-releaseXin Li
d110769efd am: da8b088e90 -s ours Change-Id: I2036cb320ddeff2e3131fb8def53101753e3b035
2017-12-07Manually merge changes from giant AOSP topicStephen Li
Change-Id: Ie4cb14562dba8071880c95481a68556633e02da5
2017-12-07Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 322a1f7ce1 -s oursXin Li
am: d110769efd Change-Id: I888a83ba92f8d75acf863f8a294ffe8438582f39
2017-12-07Merge "DO NOT MERGE: Merge Oreo MR1 into master"Xin Li
am: 322a1f7ce1 -s ours Change-Id: I77bddcf877f40cc64fd67369edb8897f31917ba9
2017-12-07DO NOT MERGE: Merge Oreo MR1 into master am: 85e907cac2 -s oursXin Li
am: b8c7094ec9 Change-Id: If83ed2789e55a495a1e0de3cdfaf45c35fcef580
2017-12-07DO NOT MERGE: Merge Oreo MR1 into masterXin Li
am: 85e907cac2 -s ours Change-Id: I2cfc6f796d34e88378b5853ad6133ce7e5358324
2017-12-06Merge "DO NOT MERGE: Merge Oreo MR1 into master"android-wear-p-preview-2android-wear-8.0.0_r1android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8o-mr1-iot-preview-7Xin Li
2017-12-06DO NOT MERGE: Merge Oreo MR1 into masterXin Li
Exempt-From-Owner-Approval: Changes already landed internally Change-Id: I008eaf1eda5d572bebe3a47b4fe93dc7163d8c45
2017-08-10release-request-0b474cbb-ff20-424d-a570-a0a7b83a7705-for-git_pi-release-4262 ↵android-build-team Robot
110 snap-temp-L42700000091449286 Change-Id: I0c070e8e87901c9cd243096be79ee0b82f6ecc24
2017-08-10Make software codecs as VNDK am: 0a43528d3dJiyong Park
am: e76d7b4c45 Change-Id: I9f484ac786ec0afb9f70ada7a06b4c9ca2537877
2017-08-10Make software codecs as VNDKJiyong Park
am: 0a43528d3d Change-Id: I86541fa0b6ee81a3c5345d6d5568a35b8e37d8c6
2017-08-07Make software codecs as VNDKoreo-mr1-devJiyong Park
Software codecs and their dependencies are marked as VNDK (or just vendor_available:true for static/header libs). Bug: 37343418 Test: build the software codecs with BOARD_VNDK_VERSION=current Change-Id: I3236ce096b02dceb71a93424b4c5433ba235f302
2017-06-30Merge changes I65063e1f,I9090720f am: 4a3459a352 am: 95bc71811a am: 22b4abc1ceElliott Hughes
am: c7ac7a2ae4 Change-Id: I68b406567f834f53836da256e717e69638cc304c
2017-06-30Merge changes I65063e1f,I9090720f am: 4a3459a352 am: 95bc71811aandroid-o-mr1-iot-preview-6o-mr1-iot-preview-6Elliott Hughes
am: 22b4abc1ce Change-Id: Ic722fd3ce7f1d9fb366fb9a4cd38f0cbf541f55c
2017-06-30Merge changes I65063e1f,I9090720f am: 4a3459a352Elliott Hughes
am: 95bc71811a Change-Id: I45845796fb13006d098b85df9deea8bfc5138538
2017-06-30Merge changes I65063e1f,I9090720fandroid-o-mr1-preview-2android-o-mr1-preview-1Elliott Hughes
am: 4a3459a352 Change-Id: I00fb227337c972bdb1ecc8aa8037e8e077efece0
2017-06-30Merge changes I65063e1f,I9090720fandroid-o-preview-4android-o-iot-preview-5o-iot-preview-5Treehugger Robot
* changes: Update libgsm to patchlevel 17. Update libgsm to patchlevel 16.
2017-06-30Update libgsm to patchlevel 17.Elliott Hughes
Fixes undefined behavior warnings from clang. external/libgsm/src/short_term.c:68:2: warning: shifting a negative signed value is undefined [-Wshift-negative-value] STEP( -1144, -4, 29708 ); ^ ~~~~~ Bug: http://b/26694729 Test: builds Change-Id: I65063e1f4ba71c6231306baa7ae8c8fded7d4c89
2017-06-30Update libgsm to patchlevel 16.Elliott Hughes
No real changes to the files we use. (Seems like contrary to README.version we were already past patchlevel 13). Also stop suppressing warnings about undefined behavior. Lying to ourselves doesn't seem useful. Bug: N/A Test: builds Change-Id: I9090720f6902e38a769405200700330951756b07
2017-04-24Merge "Convert external/libgsm to Android.bp" am: c06febc81b am: f433a3841b ↵oreo-dr1-devColin Cross
am: 4ccb7e359b am: 8dc0fc7e41 Change-Id: I957b11d7411fd9ada84c7526e6e0ec13fe4d92de
2017-04-24Merge "Convert external/libgsm to Android.bp" am: c06febc81b am: f433a3841bColin Cross
am: 4ccb7e359b Change-Id: Ic237a5e85eb05ced68a7f0aa973805266f9c0ac4
2017-04-24Merge "Convert external/libgsm to Android.bp" am: c06febc81bColin Cross
am: f433a3841b Change-Id: I49cbda7888a3c07236311a99a4780ab03efd35b9
2017-04-24Merge "Convert external/libgsm to Android.bp"Colin Cross
am: c06febc81b Change-Id: I131bea8be3c412034ae6d8fbe2018fde8d441172
2017-04-24Merge "Convert external/libgsm to Android.bp"android-wear-o-preview-4android-wear-o-preview-3android-o-preview-3android-o-preview-2android-n-iot-preview-4n-iot-preview-4Colin Cross
2017-04-21Merge "Suppress existing warnings in external/libgsm" am: 817f295ced am: ↵Aurimas Liutikas
86dbe0b7c3 am: de87db3dc7 am: e2848996f3 Change-Id: I036efb159ad03e7fcdfff395764c48fa43cbcc76
2017-04-21Merge "Suppress existing warnings in external/libgsm" am: 817f295ced am: ↵Aurimas Liutikas
86dbe0b7c3 am: de87db3dc7 Change-Id: Icee15016f0a117e629e96ae91edf87aa76a2dd6b
2017-04-21Merge "Suppress existing warnings in external/libgsm" am: 817f295cedAurimas Liutikas
am: 86dbe0b7c3 Change-Id: I4c34b39ff0fbbe8140d4e7ae71043da3e53b5b86
2017-04-21Merge "Suppress existing warnings in external/libgsm"Aurimas Liutikas
am: 817f295ced Change-Id: I968bac22d10db81ee906809a382bbd2b5b97ed46
2017-04-21Merge "Suppress existing warnings in external/libgsm"Treehugger Robot