aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
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-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-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
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
2019-12-18Revert submission 1191937-art_apex_availableJoseph Murphy
am: 2af940b63b Change-Id: I5bccad69a633ff5b520ae51a061f64f66c9262db
2019-12-19Revert submission 1191937-art_apex_availableJoseph Murphy
Original Commit Message: """ Rename modules that are APEX-only The renamed modules are only available for APEXes, but not for the platform. Use the <module_name>.<apex_name> syntax to correctly install the APEX variant of the modules. """ Reason for revert: Build Cop - Breaks about 15 AOSP targets, with high confidence due to these changes being the only non-robot changes in those builds. Reverted Changes: I190ce2d10:Use apex_available property I990e0a67e:Use apex_available property I0d1295683:Revert "Avoid duplicated classes for boot dex jars... I5fb725403:Find the jar libraries in APEX from the correct pa... I322b1efcc:Rename modules that are APEX-only Ifa2bd0f8f:Use apex_available property Iac6533177:Use apex_available property Ie999602c6:Use apex_available property I2a3d73397:Use apex_available property Ic91bcbb9a:Use apex_available property Ia6c324eed:Use apex_available property I964d0125c:Use apex_available property Change-Id: Ic76735eac719c36f5fccca8c90feca8ee9ce7c4e
2019-12-19Rename modules that are APEX-only am: 19b02461a9 am: 5e7f2ff7a7 am: 4f4dee1aefAutomerger Merge Worker
Change-Id: I6852fb736dfd748aeebdc8b4de1d8fb138e6ec3e
2019-12-19Rename modules that are APEX-only am: 19b02461a9 am: 5e7f2ff7a7Automerger Merge Worker
Change-Id: Iff9f90afcd82dbc48ad461643d8e29c9ed96db47
2019-12-18Rename modules that are APEX-onlyJiyong Park
am: 19b02461a9 Change-Id: I809b221a8d799cf1f287c7c1b0ae37c0dfade6c7
2019-12-17Rename modules that are APEX-onlyJiyong Park
The renamed modules are only available for APEXes, but not for the platform. Use the <module_name>.<apex_name> syntax to correctly install the APEX variant of the modules. Bug: 128708192 Bug: 133140750 Test: m Change-Id: I322b1efccb681ef22f95e2a1de90b7607aad9d30
2019-10-30[automerger skipped] DO NOT MERGE - ↵Xin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: eba611b974 am: 33083ceecf -s ours am skip reason: subject contains skip directive Change-Id: I719f5a711e2e35e2d0fa99f491371e25762f02c3
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li
stage-aosp-master am: eba611b974 Change-Id: I2243ba7377cb214baa119abd1209f05e8ae9527d
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li
stage-aosp-master Bug: 142003500 Change-Id: I5a6fdeec06c260837ca10b404315169af5e752fb
2019-10-18Revert "Relax sysprop neverallow rules for Fuchsia targets." am: cac5f48484 ↵Inseob Kim
am: 9a18a11b77 am: 1dd6c804a6 am: 1ed7cb2bc0 Change-Id: I1759d3bf12355dfd5fd4b8d6346d66bc2d46d103
2019-10-18Revert "Relax sysprop neverallow rules for Fuchsia targets." am: cac5f48484 ↵Inseob Kim
am: 9a18a11b77 am: 1dd6c804a6 Change-Id: I7fa26acee6ed701be630841b39a2c4e9d89e1187
2019-10-18Revert "Relax sysprop neverallow rules for Fuchsia targets." am: cac5f48484Inseob Kim
am: 9a18a11b77 Change-Id: I16a33e3066f4db7c20a370fddb899c47f526c270
2019-10-18Revert "Relax sysprop neverallow rules for Fuchsia targets."Inseob Kim
am: cac5f48484 Change-Id: Ia6dcc3f9ede7ca53b1fa8104ee657c5ef825dae9
2019-10-18Revert "Relax sysprop neverallow rules for Fuchsia targets."Inseob Kim
This reverts commit b03b756ad080ee3f4441f9e85836088290a22d11. Reason for revert: The fix aosp/1145211 is merged Change-Id: Ia7d321914127a6de87413dab55b737a627b7c2e4
2019-10-16Relax sysprop neverallow rules for Fuchsia targets. am: b03b756ad0 am: ↵Mickey Keeley
cdf0adb03d am: 9af50515f8 am: 76d2bcd3cc Change-Id: Ia089bd9c52b75c2ddb38636485251028bb0a43c3
2019-10-16Relax sysprop neverallow rules for Fuchsia targets. am: b03b756ad0 am: ↵Mickey Keeley
cdf0adb03d am: 9af50515f8 Change-Id: I4e2347fcb17144e7419d4d2249ded0e91d894fef
2019-10-16Relax sysprop neverallow rules for Fuchsia targets. am: b03b756ad0Mickey Keeley
am: cdf0adb03d Change-Id: Ice80b11624963dbcffeb94ac480ce6c3bc4132d9
2019-10-16Relax sysprop neverallow rules for Fuchsia targets.Mickey Keeley
am: b03b756ad0 Change-Id: I6e7700ec9486b991c821159014e588a38eb3e437
2019-10-16Relax sysprop neverallow rules for Fuchsia targets.Mickey Keeley
Bug: 142796797 Test: Fuchsia targets build. Change-Id: I39ec3689d5b11209f8a12b3686974eb312c3b370
2019-08-13Add core-icu4j into PRODUCT_PACKAGES am: 6a21031e6a am: 03a9cc3184 am: ↵Victor Chang
08ab190d0d am: b147cbee74 am: 3b0f3cfb9e Change-Id: I2ee5cf88c5f62d81a30956f9b291500424e8a55e