summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/apache-xml"android-s-preview-1Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/apache-xmlBob Badour
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-W3C to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I180f98bd19fabaec6d1b1f08d02674958a47f30e
2021-01-15Merge "Add visibilities for boot jars in prebuilt ART APEXes."Treehugger Robot
2020-12-17Add visibilities for boot jars in prebuilt ART APEXes.Martin Stjernholm
Necessary for https://r.android.com/1531910. Test: m nothing Bug: 171061220 Change-Id: Ib5eae3da943ad51b53734dd9d0fbb5617bdaefdc
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I4dd1a71697f1647ccba1517545f3be401ba39642
2020-10-23Merge "Rename ART release APEX to com.android.art." am: 0abda77bf9Martin Stjernholm
Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/1456269 Change-Id: I6637d107a21ad1f54aafa0cff6d4687d1dad1a39
2020-10-23Merge "Rename ART release APEX to com.android.art."Martin Stjernholm
2020-10-19Rename ART release APEX to com.android.art.Martin Stjernholm
Test: See https://r.android.com/1457217 Bug: 169639321 Change-Id: I5ed7cedcb98dde8b0cb54d90358abfd6f73efc04 Merged-In: I5ed7cedcb98dde8b0cb54d90358abfd6f73efc04
2020-04-29Merge "Add METADATA to apache-xml: Apache2=NOTICE" am: ce93cb6b97 am: ↵Treehugger Robot
2086faacd7 am: 34c27d23bc am: ba465eb61f Change-Id: Ic59393606008b5d7511950e929dda71195f4b51e
2020-04-29Merge "Add METADATA to apache-xml: Apache2=NOTICE" am: ce93cb6b97 am: ↵Treehugger Robot
2086faacd7 am: 34c27d23bc Change-Id: Id3aef55bcadd801b52f296880a8a13ca173da799
2020-04-29Merge "Add METADATA to apache-xml: Apache2=NOTICE" am: ce93cb6b97 am: 2086faacd7Treehugger Robot
Change-Id: I5a7f4b08ecf4b6ea5b65ad23870f791c40f8b5de
2020-04-29Merge "Add METADATA to apache-xml: Apache2=NOTICE" am: ce93cb6b97android-r-beta-3android-r-beta-2Treehugger Robot
Change-Id: Id37f922fe32d34d08562addce3d9c75042f3225e
2020-04-29Merge "Add METADATA to apache-xml: Apache2=NOTICE"Treehugger Robot
2020-04-28Add METADATA to apache-xml: Apache2=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: Ibb6771326a498b4a15c08f34b9f3670ae01eaf1b
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 374d9c6abf -s ours am: be882fb465 am: 3450680d89 Change-Id: I76dfe1819b423b7ba3cee6223f7754ad36a2ffbe
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 374d9c6abf -s ours am: be882fb465 Change-Id: I6a39e01a992f98f1e550a114756b8b0c1f932d99
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 374d9c6abf -s ours am skip reason: subject contains skip directive Change-Id: I7b9784c6325cee3091271ab1bfeb598827efe2dc
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: Ib0b21747229fa23aa25213e0b212b7336dc1df90
2020-04-03Merge "Remove testdex version." am: e01c2851a1 am: 8c1d6eb45a am: 94dda2944d ↵Nicolas Geoffray
am: bf8249d749 Change-Id: I9a6bb9fa94e355c63ac1c9930f0454e0ea16dd27
2020-04-03Merge "Remove testdex version." am: e01c2851a1 am: 8c1d6eb45a am: 94dda2944dNicolas Geoffray
Change-Id: I4f69e42dd72220a38348efa601360c353ed7dfaf
2020-04-03Merge "Remove testdex version." am: e01c2851a1 am: 8c1d6eb45aNicolas Geoffray
Change-Id: Idb37db3e007702748c63b924eeeecb52e1522b36
2020-04-03Merge "Remove testdex version." am: e01c2851a1 am: 8c1d6eb45aNicolas Geoffray
Change-Id: If7d1dcb20679d73cedf44e361790298abbeff990
2020-04-03Merge "Remove testdex version." am: e01c2851a1Nicolas Geoffray
Change-Id: I8cd24665bac677701d4146248fdbcf213a21bad8
2020-04-03Merge "Remove testdex version."Nicolas Geoffray
2020-04-03Remove testdex version.Nicolas Geoffray
Unused anymore. Test: m Change-Id: Iffc2db2c7968069e9c36fb7e9b8826de90604a5a
2019-12-20Merge "Revert submission ↵r_aml_301500702android-mainline-12.0.0_r55android-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_r10android11-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-releaseAutomerger Merge Worker
1194828-revert-1191937-art_apex_available-DWXQGTKMAR" am: 6527de11d5 am: 2dca977832 am: 95e1a12154 Change-Id: I5b727c0388dcdb76477e47696ad6950d347a1e1d
2019-12-20Merge "Revert submission ↵android-r-preview-4android-r-preview-3android-r-preview-2Automerger Merge Worker
1194828-revert-1191937-art_apex_available-DWXQGTKMAR" am: 6527de11d5 am: 2dca977832 Change-Id: I18362b25771b180791f0716b329662c11d1eb863
2019-12-19Merge "Revert submission 1194828-revert-1191937-art_apex_available-DWXQGTKMAR"Jiyong Park
am: 6527de11d5 Change-Id: I20fca85b3541e2d877aa5b0638aa8609701b5249
2019-12-20Merge "Revert submission 1194828-revert-1191937-art_apex_available-DWXQGTKMAR"android-r-preview-1Treehugger Robot
2019-12-19Revert submission 1194828-revert-1191937-art_apex_available-DWXQGTKMARJiyong 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 Exempt-From-Owner-Approval: relanding the same change Change-Id: Iee13480626e9f63168457ba7bdbab50dd174be32
2019-12-19Merge "Revert submission 1191937-art_apex_available" am: a857615390 am: ↵Automerger Merge Worker
021e553041 am: 380eb231fc Change-Id: I3a9e8458a609d30875f664062de9f1872a995719
2019-12-19Merge "Revert submission 1191937-art_apex_available" am: a857615390 am: ↵Automerger Merge Worker
021e553041 Change-Id: I45abd057187ba4c74b1c6d0a7e19ea725b581846
2019-12-18Merge "Revert submission 1191937-art_apex_available"Joseph Murphy
am: a857615390 Change-Id: I481c6130f8be893a9551b880f8b1530784b7f6ed
2019-12-19Merge "Revert submission 1191937-art_apex_available"Joseph Murphy
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: Icaf95d260bc674fc2cc2fc22bdaa99e7ecce03fa
2019-12-19Merge "Use apex_available property" am: 16015ab09e am: b693c70430 am: caf1d69894Automerger Merge Worker
Change-Id: I8f9473c975cd8e05985ea71f3a8c639bb1b56036
2019-12-19Merge "Use apex_available property" am: 16015ab09e am: b693c70430Automerger Merge Worker
Change-Id: I44f04ef47310571e94bb045cdd9bb4692e011fab
2019-12-18Merge "Use apex_available property"Jiyong Park
am: 16015ab09e Change-Id: Ieadfd7aaf3b7cab4337ba7bd554d5d1506a15119
2019-12-19Merge "Use apex_available property"Jiyong Park
2019-12-16Use apex_available propertyJiyong Park
Use apex_available property to prevent modules that are only for the ART apex from being used outside of the APEX. Bug: 128708192 Bug: 133140750 Test: m Change-Id: Ic91bcbb9aa85c7e74afd31876a2f7664be68e62b
2019-10-30[automerger skipped] DO NOT MERGE - ↵Xin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 3a18b514b1 am: caf0eb9480 -s ours am skip reason: subject contains skip directive Change-Id: I448a706e0eccf6481b62da8b0cca744c626709bd
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li
stage-aosp-master am: 3a18b514b1 Change-Id: I1dae1a19cc83f2379a31312b0c1b77aa292d3fab
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li
stage-aosp-master Bug: 142003500 Change-Id: Iddd45945ba9b51cfc2bbcec8e2237650bf2c5214
2019-09-23Merge "Remove duplicate libraries that are provided by system modules" am: ↵Paul Duffin
a6128ad225 am: 855a425dac am: 2d7208eb1d am: 088232e673 Change-Id: Ia0f5659fd5d729a851df9a503d4c097b231bd5bf
2019-09-23Merge "Remove duplicate libraries that are provided by system modules" am: ↵Paul Duffin
a6128ad225 am: 855a425dac am: 2d7208eb1d Change-Id: I2766457b6a1b011b8094ba0d1f389a88a68caf22
2019-09-23Merge "Remove duplicate libraries that are provided by system modules" am: ↵Paul Duffin
a6128ad225 am: 855a425dac Change-Id: Ibace0de830dba4d057b771b44c040e3bccb90915
2019-09-23Merge "Remove duplicate libraries that are provided by system modules"Paul Duffin
am: a6128ad225 Change-Id: I6b024f410efbd96f92143fd994a55607f9ab7539
2019-09-23Merge "Remove duplicate libraries that are provided by system modules"ndk-sysroot-r21Treehugger Robot
2019-09-20Remove duplicate libraries that are provided by system modulesPaul Duffin
An improvement in the Soong build means that it is no longer necessary to duplicate the libraries that it provides. This change removes the duplicates and moves the system_modules property next to sdk_version property to be consistent and because those properties are tightly coupled. Bug: 141359858 Test: m checkbuild Change-Id: If28abb588076145cf476e6644cf9bcefe3b621c6
2019-07-04Merge "Fix include syntax on libcore/OWNERS file" am: 1905988933 am: ↵Neil Fuller
439aac113b am: a26eecd73e am: f8c80e98b9 Change-Id: Ib2249b3caba107d8889652d398483655ebf7845d
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 17:08:27 +0000