aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into masterXin Li
am: cb5c455ed1 -s ours am skip reason: subject contains skip directive Change-Id: I7b0a3625ef33ec814e9800463d72656428a38058
2019-09-04DO NOT MERGE - Merge Android 10 into masterndk-sysroot-r21Xin Li
Bug: 139893257 Change-Id: I3642789b90cb5e10145e07f8fc44d7cd688bfad2
2019-08-12[automerger skipped] Pull commits from upstream for java 11 compatibility! ↵Eugene Susla
am: 9f80b7e1e7 am: 6525fedf38 am: 300e674c37 am: 08ddcfb2e6 am: 4e3bcbd66d -s ours am skip reason: change_id I27826ba60af5c54848e2eae40930d8fb8a302919 with SHA1 1410e008c8 is in history Change-Id: I3b997b7e0f4b4a064485a045aebd5153b756cd4c
2019-08-12[automerger skipped] Javaparser Android.bp am: fe0ef2213f -s ours am: ↵Eugene Susla
40862333af -s ours am: f4515b3b62 -s ours am: 3d21cb213a -s ours am: c72d2519fc -s ours am skip reason: change_id Ibf69fcb1467c0414221913f2f1a9e1599b604aa0 with SHA1 2a66cdba31 is in history Change-Id: I79f20184074c16fe53627c4711193f88797a99fa
2019-08-12Pull commits from upstream for java 11 compatibility! am: 9f80b7e1e7 am: ↵Eugene Susla
6525fedf38 am: 300e674c37 am: 08ddcfb2e6 Change-Id: I4752d1ce40e4948e0c46e7824e3f955481c053cd
2019-08-12[automerger skipped] Javaparser Android.bp am: fe0ef2213f -s ours am: ↵Eugene Susla
40862333af -s ours am: f4515b3b62 -s ours am: 3d21cb213a -s ours am skip reason: change_id Ibf69fcb1467c0414221913f2f1a9e1599b604aa0 with SHA1 2a66cdba31 is in history Change-Id: I39b6b6f7edc30b0d12b53758020ba6687aae0bbe
2019-08-12Pull commits from upstream for java 11 compatibility! am: 9f80b7e1e7 am: ↵Eugene Susla
6525fedf38 am: 300e674c37 Change-Id: I11d4d8ba2c8822a0ff6447d72835f232dc93e027
2019-08-12[automerger skipped] Javaparser Android.bp am: fe0ef2213f -s ours am: ↵Eugene Susla
40862333af -s ours am: f4515b3b62 -s ours am skip reason: change_id Ibf69fcb1467c0414221913f2f1a9e1599b604aa0 with SHA1 2a66cdba31 is in history Change-Id: Ibbfba853d9fc651babb603a0fb4ebd1adb451e50
2019-08-12Pull commits from upstream for java 11 compatibility! am: 9f80b7e1e7Eugene Susla
am: 6525fedf38 Change-Id: I051eee729c8cfb16f3af68185e7246159a7a3d13
2019-08-12[automerger skipped] Javaparser Android.bp am: fe0ef2213f -s oursEugene Susla
am: 40862333af -s ours am skip reason: change_id Ibf69fcb1467c0414221913f2f1a9e1599b604aa0 with SHA1 2a66cdba31 is in history Change-Id: I1e8645eb6c6eb1b9d93dcdfed5ebee9e9a460455
2019-08-12Pull commits from upstream for java 11 compatibility!temp_140451723Eugene Susla
am: 9f80b7e1e7 Change-Id: Iad341e501d862dd58436f54f7f73d1d08f152fab
2019-08-12[automerger skipped] Javaparser Android.bpEugene Susla
am: fe0ef2213f -s ours am skip reason: change_id Ibf69fcb1467c0414221913f2f1a9e1599b604aa0 with SHA1 2a66cdba31 is in history Change-Id: I3947438e92f55e00b8571cde7dd1f38270598e47
2019-08-09Pull commits from upstream for java 11 compatibility!Eugene Susla
(cherry picked from commit 1410e008c8ea196afec98d7766e6dca5c9d555b4) Test: make javaparser, with the default OpenJDK 9 toolchain and an OpenJDK 11 toolchain Bug: 135178920 Merged-In: I27826ba60af5c54848e2eae40930d8fb8a302919 Change-Id: Iecc272dbce30747131f2c2ae03fdb39965bc838b
2019-08-09Javaparser Android.bpEugene Susla
Test: mmma external/javaparser and inspect resulting out/host/linux-x86/framework/javaparser.jar (cherry picked from commit 2a66cdba31a132a02d16db7b065b243658250e36) Bug: 135178920 Merged-In: Ibf69fcb1467c0414221913f2f1a9e1599b604aa0 Change-Id: Ie76c306a05e481d571276c43a5501037ead84f14
2019-07-31Pull commits from upstream for java 11 compatibility!Eugene Susla
Change-Id: I27826ba60af5c54848e2eae40930d8fb8a302919
2019-07-02[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor ↵Xin Li
(5699924) into stage-aosp-master am: 36e290fec2 am: 86b6c76d6a -s ours am skip reason: subject contains skip directive Change-Id: Ie2738a8f74068d6a9312f8bea16221cb4d1c09b2
2019-07-02DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵Xin Li
stage-aosp-master am: 36e290fec2 Change-Id: Iacc4f374a9f5305b6a32c49f697ec2d82a454ad8
2019-07-01DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵Xin Li
stage-aosp-master Bug: 134405016 Change-Id: I80e3668012016c3affe983c4618d818bc1e235e8
2019-02-24[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-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: 5bb8b4fe87 -s ours am skip reason: subject contains skip directive Change-Id: I1742d32e0a16ef0543a4fe0eb4ada2263a285577
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: I0b9f422dd6d64912d1ca42b941a1478a0e76da2b
2019-01-04Add default active developers into OWNERS am: 5a57bd3ed7 am: 4a7edc26ccChih-Hung Hsieh
am: 8d1884e4fb Change-Id: I2763f34d4f4c88893458333396f0ed018201a66c
2019-01-04Add default active developers into OWNERS am: 5a57bd3ed7Chih-Hung Hsieh
am: 4a7edc26cc Change-Id: I12542b5575a5d18d73d7ae0d3e64268a89fff067
2019-01-04Add default active developers into OWNERSChih-Hung Hsieh
am: 5a57bd3ed7 Change-Id: I36633bf682a123660849978772c31de6c65d9ee5
2019-01-04Add default active developers into OWNERSandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1Chih-Hung Hsieh
Bug: 33166666 Test: gerrit uploader Change-Id: Ica85b4412c840e4fbe2cbcfc87d3364a3309f34d
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: dce775396b -s ours am: 81930d1b3b -s ours am: 1372b01d3e -s ours Change-Id: Ib0a8aaf3f57de16b85d2dc7335381366610004a4
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: dce775396b -s ours am: 81930d1b3b -s ours Change-Id: I1ed51e81abb31e3d1962aeb946211e1796552bfd
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
am: dce775396b -s ours Change-Id: If8458c9d3bba3fa75c7b9a7c84be5218e77679a2
2018-10-24Merge pie-platform-release to aosp-master - DO NOT MERGEandroid-wear-8.0.0_r2Bill Yi
Change-Id: Iab2e7964a8c3edfa8c8e1be3c9eda6893c497505
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 0379c4e7aa -s ours am: 71f11968ef -s ours Change-Id: Ib4fd1b069d5ce8f31f5e3df7109d863316dde2da
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 0379c4e7aa -s ours Change-Id: If9f36e1676204f79d62e9819afa0c2d26ad389d1
2018-10-24Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi
Change-Id: Ia62aaac7b1bc3d68802135b7f6a99973dcf61be1
2018-09-04Add METADATA for javaparser am: b2ed4db985 am: dbafeba9c9Haibo Huang
am: ae38316386 Change-Id: I5c8bebdf3bc528007fd232a3c115499b60363267
2018-09-04Add METADATA for javaparser am: b2ed4db985Haibo Huang
am: dbafeba9c9 Change-Id: I4b1e5f8472bec6c65492112fbb0aa0700d38c58c
2018-09-04Add METADATA for javaparserHaibo Huang
am: b2ed4db985 Change-Id: I697ab7114546ead82d3fa954f673eb2fd64cd559
2018-09-04Add METADATA for javaparsermaster-cuttlefish-testing-releaseHaibo Huang
Test: NA Change-Id: I9812ba07ce6da44270639f6151a7daac05af6fb9
2018-06-12Fix javaparser compilation with OpenJDK 9 -target 1.9.Tobias Thierer
javaparser contains references to @javax.annotation.Generated which is in the module java.xml.ws.annotation, which isn't available by default. Therefore, this CL adds that annotation via the javac command line for this host target. Bug: 38177569 Test: USE_R8=true EXPERIMENTAL_USE_OPENJDK=true make checkbuild Change-Id: Iaef75f0fd1344d739517093cfb26eaff3cf9be36
2018-04-26Javaparser Android.bpEugene Susla
Test: mmma external/javaparser and inspect resulting out/host/linux-x86/framework/javaparser.jar Change-Id: Ibf69fcb1467c0414221913f2f1a9e1599b604aa0
2018-03-04Snap for 4632767 from 1afe9e0652b9b53edade5aa276162abe27b32a67 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: Ibe65883e94ed5a7272dff3f100393987a1cf3da2
2018-03-03Preserving commit history am: b7e221621d am: 7d05f42406android-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-devEugene Susla
am: ac95818199 Change-Id: I03d7d631ac4c2f0dec9704ce6c73d3f6230dab29
2018-03-03Preserving commit history am: b7e221621dEugene Susla
am: 7d05f42406 Change-Id: I2f3f4f86afcbbbbd6b7d8ffef57a29cfa5ec8e65
2018-03-03Preserving commit historyEugene Susla
am: b7e221621d Change-Id: I9966933b76bb87381322ee5c036f64d98e82d157
2018-03-02Preserving commit historyandroid-wear-p-preview-2android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1Eugene Susla
2018-02-28Merge pull request #1444 from matozoid/issue_1442_lazytypeFederico Tomassetti
Fix bug in LazyType
2018-02-27Merge branch 'master' into issue_1442_lazytypeDanny van Bruggen
2018-02-27Fix bug in LazyTypeDanny van Bruggen
2018-02-27Merge pull request #1423 from daanschipper/masterDanny van Bruggen
SourceRoot implementation for JSS
2018-02-27Merge branch 'master' of https://github.com/daanschipper/javaparserDaan Schipper
2018-02-27DirFilter to skip certain directories, and skipping sub tree while walking ↵Daan Schipper
file tree instead of skipping siblings
2018-02-27make use of javaparser log frameworkDaan Schipper
2018-02-27unit testDaan Schipper
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 08:22:16 +0000