aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-06-28Snap for 10399941 from 229d4d033e7f6b764de4f864825d829c78b32635 to sdk-releaseplatform-tools-34.0.5platform-tools-34.0.4sdk-releaseAndroid Build Coastguard Worker
Change-Id: I8c330bcacd0e6eca5aae452e1cb93c737c995469
2023-04-20Snap for 9979206 from 0aa2469a56ac486dd0475c6c1bb107c133192166 to sdk-releaseplatform-tools-34.0.3Android Build Coastguard Worker
Change-Id: I2838c32a35cfd87333f06714915178bf49c8d714
2023-03-02Snap for 9679998 from 922c8224fb9b409449ba93ddbcd60a34de7a377c to sdk-releaseplatform-tools-34.0.1Android Build Coastguard Worker
Change-Id: I765db4b13bc24a286c1fa39710aebb54d68f601e
2023-02-09Expand owners am: 922c8224fb am: 0aa2469a56HEADmastermainTheodore Dubois
Original change: https://android-review.googlesource.com/c/device/google/fuchsia/+/2428012 Change-Id: If59598b0ea7e8b481e8a25bde27756744c602eed Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09Expand owners am: 922c8224fbandroid-u-beta-1-gplTheodore Dubois
Original change: https://android-review.googlesource.com/c/device/google/fuchsia/+/2428012 Change-Id: Ib2be60445fe1ef8442658fbc9f7d13a2bf43ebd6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-08Expand ownersTheodore Dubois
Change-Id: I235ad392d0fe5a06929aa56c543ac838850fe0ad
2023-02-01Snap for 9550355 from 0806ec4c1b8592b20f64440151def07fc6ee07a4 to sdk-releaseplatform-tools-34.0.0platform-tools-33.0.4Android Build Coastguard Worker
Change-Id: Ia6185ebe79f3b88e2b3dd34f15d1960636398571
2022-08-23Manually merge AOSP master am: 892a2ff855 am: fdfef7058e am: 00231b7923main-16k-with-phonesTheodore Dubois
Original change: https://googleplex-android-review.googlesource.com/c/device/google/fuchsia/+/19608067 Change-Id: I5532a1bb8e7879ed16cacb35af3385e86365b50f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23Manually merge AOSP master am: 892a2ff855 am: fdfef7058eTheodore Dubois
Original change: https://googleplex-android-review.googlesource.com/c/device/google/fuchsia/+/19608067 Change-Id: I284560b726e2cce1833a480ce3605026297066bb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23Manually merge AOSP master am: 892a2ff855Theodore Dubois
Original change: https://googleplex-android-review.googlesource.com/c/device/google/fuchsia/+/19608067 Change-Id: I087454d1a62d27e2dc696ad166656d199075497e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12Manually merge AOSP masterTheodore Dubois
Automerger doesn't run because this repo isn't in the manifest, and we can't add the repo to the manifest without first fixing build errors by merging upstream. Change-Id: I696110f9f1365f892e24cd60e6eea188bba1251f
2022-07-12[fuchsia] Clear out device/google/fuchsiamain-16kgki13-boot-releaseTheodore Dubois
Everything here isn't needed anymore. Test: n/a Change-Id: Ia2c5e583c29fddd1ea41ccfbbb8b10cc7ed6341f
2021-03-04Snap for 7183507 from 1bb70c01a01d874502a3cdb16e73302b83c7a99e to sdk-releaseplatform-tools-31.0.3platform-tools-31.0.2platform-tools-31.0.1android-build-prod (mdb)
Change-Id: I44e5bd171ed0d5591ff923d84e615bcd612e2ae3
2021-02-20Mark ab/7061308 as merged in stage.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-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1main-cg-testing-releaseandroid-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1android-s-beta-5android-s-beta-4Xin Li
Bug: 180401296 Merged-In: I0a74a758c9095c400d9f25cdfed97bb981a30fd9 Change-Id: I2f94cec9ec881e51341ba5af201fcadd406c1190
2021-02-15[LSC] Add LOCAL_LICENSE_KINDS to device/google/fuchsia am: 3f3fbdd08cBob Badour
Original change: https://android-review.googlesource.com/c/device/google/fuchsia/+/1589081 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id49c8191013c050165aa080633405511100113eb
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to device/google/fuchsiaandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-MIT to: Android.bp bioniccompat/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I9c1cedd46ed744b587beeed5bcaa99fffcffe8af
2021-01-29Snap for 7110675 from 6d207b9a6bb1b92fd96d9af557cc41dded95df97 to sdk-releaseplatform-tools-31.0.0android-build-prod (mdb)
Change-Id: I708163f90969b230d12633fec99ead72becb8c05
2020-11-24Mark ab/6881855 as merged am: 6d207b9a6bXin Li
Original change: https://googleplex-android-review.googlesource.com/c/device/google/fuchsia/+/13111969 Change-Id: I0a74a758c9095c400d9f25cdfed97bb981a30fd9
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: Id031bcf83e83f43e49754be3015ae35e28cf66f8
2020-10-23Rename ART release APEX to com.android.art. am: 8bd7b3a49a am: 5af6bb6bba ↵Martin Stjernholm
am: 1e6cfe52ae Original change: https://android-review.googlesource.com/c/device/google/fuchsia/+/1456727 Change-Id: I8b761751a744ec1b6da5956c67e24000d6047d87
2020-10-23Rename ART release APEX to com.android.art. am: 8bd7b3a49a am: 5af6bb6bbaMartin Stjernholm
Original change: https://android-review.googlesource.com/c/device/google/fuchsia/+/1456727 Change-Id: I8507470693b12227b4074aebf030f17293fccecc
2020-10-23Rename ART release APEX to com.android.art. am: 8bd7b3a49aMartin Stjernholm
Original change: https://android-review.googlesource.com/c/device/google/fuchsia/+/1456727 Change-Id: I0f3f1a6a68287f179e5a91cf02ca35bc4ca46381
2020-10-19Rename ART release APEX to com.android.art.Martin Stjernholm
Test: See https://r.android.com/1457217 Bug: 169639321 Change-Id: I827c4fd4e4f12a128aae11f2c6ba7300ff78212b Merged-In: I827c4fd4e4f12a128aae11f2c6ba7300ff78212b
2020-10-01Snap for 6877830 from 1dcc46626f65d419b8211806cff1b66f4e0b995f to sdk-releaseplatform-tools-30.0.5android-build-prod (mdb)
Change-Id: I30dde5e4baffba8fc0305c7efefcd0a262a60e72
2020-07-08Snap for 6660490 from b9172e6cf28630eccb3ca9b534e44ad7700f3fe1 to sdk-releaseplatform-tools-30.0.4android-build-prod (mdb)
Change-Id: I4146f9bb7d4a12672090405988014c484deee6ca
2020-05-27Snap for 6533464 from 20afab60a1285044ac8003d29dbdf2ff865b46fa to sdk-releaseplatform-tools-30.0.3platform-tools-30.0.2android-build-prod (mdb)
Change-Id: I3274f8a1ba4047e5a1310c2b13c7e6eed2c184b6
2020-05-05Add METADATA to fuchsia: Apache2+BSD+MIT=NOTICE am: 20afab60a1 am: ↵Bob Badour
b9172e6cf2 am: 1dcc46626f am: 78c7a956d5 Change-Id: I4badac367ef93e5c9734ce26b6b34a629d85531f
2020-05-05Add METADATA to fuchsia: Apache2+BSD+MIT=NOTICE am: 20afab60a1 am: ↵Bob Badour
b9172e6cf2 am: 1dcc46626f Change-Id: I2e633b64ad738a867cc1dc5a13bf9669046a0cbb
2020-05-05Add METADATA to fuchsia: Apache2+BSD+MIT=NOTICE am: 20afab60a1 am: b9172e6cf2Bob Badour
Change-Id: Ie22ad44ec4a7b865b0e6871ae79522a4b6605ffc
2020-05-05Add METADATA to fuchsia: Apache2+BSD+MIT=NOTICE am: 20afab60a1android-r-beta-3android-r-beta-2Bob Badour
Change-Id: Ia4fbec01462b6590e0c95cb52da0a42892c28fc6
2020-05-01Add METADATA to fuchsia: Apache2+BSD+MIT=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: Ic93c2ae5ba5d5dabb3f378a3bcf7e4de8a97b980
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 515fb71097 -s ours am: 83f7f41aa3 am: f3ee239ffd Change-Id: I1cd62c67ea45e12fb13e45bddb99791d30ad62a1
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 515fb71097 -s ours am: 83f7f41aa3 Change-Id: I04077623a4fa767b13b50f400d40f5e0f0a29e35
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 515fb71097 -s ours am skip reason: subject contains skip directive Change-Id: I152e05f476bf282d2c10d0ad8ebbebf9c1cdda9f
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I8c74a00fdca75fe85fa3a224132d462308fc11be
2020-03-30Snap for 6348162 from be5559adf826e09a288dae3a04a5e43ac2f74f77 to sdk-releaseplatform-tools-30.0.1platform-tools-30.0.0android-build-prod (mdb)
Change-Id: I38d3802470407dc9fa8b98663be85ea9c4faf333
2020-03-28Skip boot jars check. am: be5559adf8 am: abc2aa5459 am: 550c05a91b am: ↵Mickey Keeley
8a15240ddb Change-Id: I3731b404fd55fa25f385810d8cf4b9a71ed0cbd0
2020-03-28Skip boot jars check. am: be5559adf8 am: abc2aa5459 am: 550c05a91bMickey Keeley
Change-Id: I3d277b1027952721a311e6b1f02687120711c013
2020-03-28Skip boot jars check. am: be5559adf8 am: abc2aa5459Mickey Keeley
Change-Id: I31d7d2d82a177bb10148d2ab634ba41d1a58747c
2020-03-28Skip boot jars check. am: be5559adf8 am: abc2aa5459Mickey Keeley
Change-Id: If9e6784e3389912dfce74f152d78e444b8c04ef6
2020-03-28Skip boot jars check. am: be5559adf8Mickey Keeley
Change-Id: I349803fce022c0b80af5ec86b8868c9bbe2a0649
2020-03-28Skip boot jars check.Mickey Keeley
Bug: 152675819 Test: Builds. Change-Id: Id5cf4946e552e60fcff250ec44f5c688c01c89d3
2020-03-12Snap for 6290619 from bd27589b2b24d0975261e0b400c60b74bd18dfd4 to sdk-releaseandroid-build-prod (mdb)
Change-Id: I671d8c175c447fb465c50c4b1e775d3d774bf1d1
2020-02-11Snap for 6198741 from 955fb9863dc388a2abc40ce1b0d9b5879f75c90d to sdk-releaseplatform-tools-29.0.6android-build-prod (mdb)
Change-Id: I6ad51b26b05ddaf850c860f7c05c986be8b6d6e0
2019-12-20Revert submission 1194828-revert-1191937-art_apex_available-DWXQGTKMAR am: ↵r_aml_301500702android-mainline-12.0.0_r55android-mainline-12.0.0_r112android-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_r10aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseandroid11-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-releaseaml_tz2_305400100Automerger Merge Worker
955fb9863d am: e7d1384037 am: bd27589b2b Change-Id: I5ff5727437505fa5264de057646acc6bad9d32be
2019-12-20Revert submission 1194828-revert-1191937-art_apex_available-DWXQGTKMAR am: ↵android-r-preview-4android-r-preview-3android-r-preview-2Automerger Merge Worker
955fb9863d am: e7d1384037 Change-Id: I9d98f9451d8b40f9271430a71d59d974d4367fe1
2019-12-19Revert submission 1194828-revert-1191937-art_apex_available-DWXQGTKMARJiyong Park
am: 955fb9863d Change-Id: I778ea87de1672c4244a3b0af3ea769f65b2ee603
2019-12-19Revert submission 1194828-revert-1191937-art_apex_available-DWXQGTKMARandroid-r-preview-1Jiyong Park
Reason for revert: relanding with fix Reverted Changes: Ic4119368c:Revert submission 1191937-art_apex_available Ia084976bb:Revert submission 1191937-art_apex_available Iada86226d:Revert submission 1191937-art_apex_available Ic76735eac:Revert submission 1191937-art_apex_available I1eb30e355:Revert submission 1191937-art_apex_available Icaf95d260:Revert submission 1191937-art_apex_available Ie8bace4be:Revert submission 1191937-art_apex_available I8961702cf:Revert submission 1191937-art_apex_available I39316f9ef:Revert submission 1191937-art_apex_available I522a7e83b:Revert submission 1191937-art_apex_available I8b9424976:Revert submission 1191937-art_apex_available I48b998629:Revert submission 1191937-art_apex_available Change-Id: I82fa1f9cc407001ef0c2c808591209c43985786a
2019-12-19Revert submission 1191937-art_apex_available am: 2af940b63b am: 111df5aa0a ↵Automerger Merge Worker
am: 8621aab5ec Change-Id: Ibd47624214fdf91a3555b5f0d991db163c424074
2019-12-19Revert submission 1191937-art_apex_available am: 2af940b63b am: 111df5aa0aAutomerger Merge Worker
Change-Id: Ifeb9b812cfc1a279b6f30b4b0dc24654eef49556