aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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: f9d606f553 Change-Id: If544b60c25c8935238247c44ff0ee4ac6ef6d87c
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: I41834559120c469ef9c853e353f9c2cad82d3a31
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: If5573bee0be4e88309267ed026d9676e623c19d1
2019-02-04[automerger skipped] Merge "make libjsoncpp available for init and in VNDK" ↵Suren Baghdasaryan
am: 8811b79061 am: 8eff3631a8 am: 860f2e29aa -s ours am skip reason: change_id I8cd589f02fd7beef351f5962e1a257418e253f6c with SHA1 a1ea48c781 is in history Change-Id: Ia2b464968258975aba740649e68430b72d80a579
2019-02-04Merge "make libjsoncpp available for init and in VNDK" am: 8811b79061Suren Baghdasaryan
am: 8eff3631a8 Change-Id: Ieb09613157a2bd6607a20f8b3dffef2a25d20196
2019-02-03Merge "make libjsoncpp available for init and in VNDK"Suren Baghdasaryan
am: 8811b79061 Change-Id: Ida99ad41ecfec46da594be3046af2d66f844f83f
2019-02-03Merge "make libjsoncpp available for init and in VNDK"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-releaseSuren Baghdasaryan
2019-02-02make libjsoncpp available for init and in VNDKSuren Baghdasaryan
init_second_stage needs to parse cgroups.json file and therefore requires libjsoncpp. Make it available for init on recovery partition. Also add libjsoncpp into vndk because libprocessgroup needs it. Exempt-From-Owner-Approval: janitorial Bug: 111307099 Test: builds, boots Change-Id: I8cd589f02fd7beef351f5962e1a257418e253f6c Merged-In: I8cd589f02fd7beef351f5962e1a257418e253f6c Signed-off-by: Suren Baghdasaryan <surenb@google.com>
2019-02-01make libjsoncpp available for init and in VNDKSuren Baghdasaryan
init_second_stage needs to parse cgroups.json file and therefore requires libjsoncpp. Make it available for init on recovery partition. Also add libjsoncpp into vndk because libprocessgroup needs it. Exempt-From-Owner-Approval: janitorial Bug: 111307099 Test: builds, boots Change-Id: I8cd589f02fd7beef351f5962e1a257418e253f6c Signed-off-by: Suren Baghdasaryan <surenb@google.com>
2019-01-11Merge "Add default code reviewers into OWNERS" am: 0699c4cfdc am: 4abd186ce2Chih-hung Hsieh
am: 7bdd3f2503 Change-Id: Id7f733d7308f80b6c636370c95407f62016c0b0c
2019-01-11Merge "Add default code reviewers into OWNERS" am: 0699c4cfdcChih-hung Hsieh
am: 4abd186ce2 Change-Id: I7dc3e89d86931c480024f1ae1a6ebf668c140d40
2019-01-11Merge "Add default code reviewers into OWNERS"Chih-hung Hsieh
am: 0699c4cfdc Change-Id: I4d179d8a88b39e62344d3e328505588b8ecc1a67
2019-01-11Merge "Add default code reviewers into OWNERS"Chih-hung Hsieh
2019-01-09Add default code reviewers into OWNERSChih-Hung Hsieh
Bug: 33166666 Test: gerrit uploader Change-Id: I6bb7793d448db2490cc03256471f353e970e6bdc
2018-12-07Merge "Don't automatically include the build directory." am: 4169f6396f am: ↵Dan Albert
d5d508c396 am: be0998f1b3 Change-Id: Ie067754c0d100e31aea6e27c338d6484c5575c94
2018-12-07Merge "Don't automatically include the build directory." am: 4169f6396fDan Albert
am: d5d508c396 Change-Id: Ia9ab94e0618574257978b7744fb4ddda6b0a431c
2018-12-07Merge "Don't automatically include the build directory."Dan Albert
am: 4169f6396f Change-Id: I33266ac5080091e0243c3ea3295e398ccfbe3475
2018-12-08Merge "Don't automatically include the build directory."android-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7Treehugger Robot
2018-12-06Don't automatically include the build directory.Dan Albert
This directory contains a file named "version", which conflicts with the standard library's <version>. Test: m checkbuild Bug: None Change-Id: I8dc160c8718dac672436d196d917b901163fd68b
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 6fc9b08703 -s ours am: 27d5bc470e -s ours am: f01730af4f -s ours Change-Id: If3986132debff81d31ecf2bddf3519459cd9a105
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 6fc9b08703 -s ours am: 27d5bc470e -s ours Change-Id: I807aab5a989b3cdfcd3c04c8f2498926512db66c
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
am: 6fc9b08703 -s ours Change-Id: Ib8ddbb55d91746c2ee3f649b0248a111a8f604e6
2018-10-24Merge pie-platform-release to aosp-master - DO NOT MERGEandroid-wear-8.0.0_r2android-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-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-n-iot-release-ihome-igv1nougat-iot-releaseBill Yi
Change-Id: Ic39005c4e61fe9b4cd6994be03975291240bda19
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: febef17795 -s ours am: b4e0ebe640 -s ours Change-Id: I33409b959a6e32337e5335ebf9697eab6c031bad
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: febef17795 -s ours Change-Id: Ie5f54f2e15dabca0020ac75d14aa8d962ef7c4e6
2018-10-24Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi
Change-Id: I7d65897bdf8915e386846a1a6848c6a044217720
2018-09-04Merge "Suppress -Wimplicit-fallthrough." am: 31300f7276 am: 507c789494Chih-Hung Hsieh
am: 14730431eb Change-Id: Ib208eeda3651a8eacf8284f292e64892fc09a7d7
2018-09-04Merge "Suppress -Wimplicit-fallthrough." am: 31300f7276Chih-Hung Hsieh
am: 507c789494 Change-Id: I39e9d0413566f975f3e9069f043203519d69de91
2018-09-04Merge "Suppress -Wimplicit-fallthrough."Chih-Hung Hsieh
am: 31300f7276 Change-Id: I768fb85ba1b31eb45f906057847d993ae428a78b
2018-09-04Merge "Suppress -Wimplicit-fallthrough."android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseTreehugger Robot
2018-09-04Suppress -Wimplicit-fallthrough.Chih-Hung Hsieh
-Wimplicit-fallthrough will be enabled globally. Test: build with global -Wimplicit-fallthrough. Change-Id: I69e349d2f71b3d78bd5e5844e4c2f19d92262ef5
2018-08-16Merge "Compile a .so for libjsoncpp." am: 93ba642c63 am: da6cb4a7cbDoug Horn
am: 3f1a32a51c Change-Id: I51a8922c405775a9ff3f6352ce4a658a867649cb
2018-08-16Merge "Compile a .so for libjsoncpp." am: 93ba642c63Doug Horn
am: da6cb4a7cb Change-Id: I67fc310465fdb7b37fd06b434523ab41b2d8aae2
2018-08-16Merge "Compile a .so for libjsoncpp."Doug Horn
am: 93ba642c63 Change-Id: I6147b0c152175546820166cc9d6343fc7a2524f8
2018-08-16Merge "Compile a .so for libjsoncpp."Doug Horn
2018-08-15Compile a .so for libjsoncpp.Doug Horn
Bug: 112525006 Test: `mma' Change-Id: I50e92dc9a7153988e7084e55e0bef1c327715594
2018-08-08Merge "Merge Android Pie into master" am: c8fe10e576 am: 773492c645 am: ↵Xin Li
6045c61aa2 am: cc23d265ea Change-Id: I7d3ec0b6191987b2e3648f71d44e5fbc8d0b890d
2018-08-07Merge "Merge Android Pie into master" am: c8fe10e576 am: 773492c645Xin Li
am: 6045c61aa2 Change-Id: I932be004c6f714b6461d266370ab70d5943acbe5
2018-08-07Merge "Merge Android Pie into master" am: c8fe10e576Xin Li
am: 773492c645 Change-Id: Icea8b5977c2a7cc851b81cc2bcc67b348886559a
2018-08-07Merge "Merge Android Pie into master"Xin Li
am: c8fe10e576 Change-Id: I23bd3f524f588806159370cb161249eb41503516
2018-08-07Merge "Merge Android Pie into master"android-o-mr1-iot-release-1.0.3Xin Li
2018-08-06Merge Android Pie into masterXin Li
Bug: 112104996 Change-Id: I722816616ab2becfd328485c0a10da0351a29ca3
2018-06-09Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: 1a1096f12bXin Li
am: 6efe210c8c Change-Id: I8d6662e415d0098b0259d3c904c44dfd944df2b0
2018-06-09Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li
am: 1a1096f12b Change-Id: I4c9ee556c042ca4efd520fda65016ee55718a467
2018-06-08Merge pi-dev-plus-aosp-without-vendor into stage-aosp-mastertemp_p_mergeXin Li
Bug: 79597307 Change-Id: I79c5115f08b0d3f684eb38efe00a751f363ed965
2018-03-22Snap for 4670666 from fd78d1f820fafb50dc6b8e72fbe3a0a0f9f2061c 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: Iab30bc6e7f27202b3a17e13fbf1a0ef1f8298264
2018-03-21Add the sdk_version that this should be built against. am: fd78d1f820Derek Sollenberger
am: 0d05cd9314 Change-Id: I92168aca4f87bc5f939ad22245ad617c75d843c5
2018-03-21Add the sdk_version that this should be built against.Derek Sollenberger
am: fd78d1f820 Change-Id: I14277bb0cf206e19a91baf0a08d8d2dfb4ef3e28
2018-03-21Add the sdk_version that this should be built against.android-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-devDerek Sollenberger
Setting this enables our testing tools that must be SDK/NDK compliant to include these static libs in their builds. Bug: 74442448 Test: compile and CtsSkQPTestCases Change-Id: I0dc742c6c177a99e662af171bd41f789cf51a48f
2017-12-11Snap for 4496165 from 12f62f1c93425ec51f542779d205266dd787d56f to pi-releaseandroid-build-team Robot
Change-Id: I085e01339db20475ad3268ac10b72e75b5e39668
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-25 18:27:45 +0000