aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-10-30[automerger skipped] DO NOT MERGE - ↵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-releaseXin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 1bace98412 am: 49d8afb799 -s ours am skip reason: subject contains skip directive Change-Id: I609e0321d028deaa75b2365e1e41e48e2aa17b18
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-4android-r-preview-3android-r-preview-2Xin Li
stage-aosp-master am: 1bace98412 Change-Id: I3e77b40027a40b410446dad56ad1b24a1aed440a
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-1Xin Li
stage-aosp-master Bug: 142003500 Change-Id: I3907f111f33f7d3f9b9bba1b7db8bd3451f3785f
2019-10-11Remove reference to java.xml.ws.annotation. am: 188dc7001f am: c3aaa4c6f2 ↵Pete Gillin
am: 87cdbb0795 am: ebdb07b40e Change-Id: Iccf456932f362cd27fa3d3be9cf509a1b66e6071
2019-10-11Remove reference to java.xml.ws.annotation. am: 188dc7001f am: c3aaa4c6f2Pete Gillin
am: 87cdbb0795 Change-Id: I4427e436970114680903e30133479e5578dba6a8
2019-10-11Remove reference to java.xml.ws.annotation. am: 188dc7001fPete Gillin
am: c3aaa4c6f2 Change-Id: Iced8cf491c53aa2ad129861d0d4e2150f6b85d1a
2019-10-11Remove reference to java.xml.ws.annotation.Pete Gillin
am: 188dc7001f Change-Id: Ibc20e729fb3e3b295a44a2d7989f01674752c69c
2019-10-11Remove reference to java.xml.ws.annotation.Pete Gillin
This is not needed any more, because the code was upgraded to a newer version from upstream which migrated away from using javax.annotation.Generated (see https://r.android.com/1099815). The redundant --add-modules option breaks builds with -source 9 -target 9 (so the Java module system is enabled) using OpenJDK 11 (which removes this module). In other words, the third of the 'Test' lines below fails without this change and succeeds with it. Test: make javaparser Test: EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9=true make javaparser Test: EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9=true EXPERIMENTAL_USE_OPENJDK11_TOOLCHAIN=true make javaparser Test: . $ANDROID_BUILD_TOP/frameworks/base/tests/Codegen/runTest.sh (in downstream branch) Bug: 131683177 Change-Id: Id0e6adcb4ba56b0d15f904891c5fda655953f4f3
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 277f31e141 -s ours am: 9eb8dd9805 -s ours am: 0c58e5c4dc -s ours am skip reason: change_id I3642789b90cb5e10145e07f8fc44d7cd688bfad2 with SHA1 cb5c455ed1 is in history Change-Id: Idb33808b5a099e4e5ced7ff4930641871276cdbd
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 277f31e141 -s ours am: 9eb8dd9805 -s ours am skip reason: change_id I3642789b90cb5e10145e07f8fc44d7cd688bfad2 with SHA1 cb5c455ed1 is in history Change-Id: Id0abc395dd402e233e10b7ee8f7417370dd9e7b7
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 277f31e141 -s ours am skip reason: change_id I3642789b90cb5e10145e07f8fc44d7cd688bfad2 with SHA1 cb5c455ed1 is in history Change-Id: I9044f99ac8c6f9771e92a9f6f263b1ba13343641
2019-09-08Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li
No content change. Bug: 135460123 Change-Id: I6d9010558228237cb51d8f8d69c527d061df267b Merged-In: I3642789b90cb5e10145e07f8fc44d7cd688bfad2
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
cb5c455ed1 -s ours am: b75f646c5c am: 19c906e43e am: 6fe394784d -s ours am skip reason: subject contains skip directive Change-Id: Iea75d2296ba716f9ab662b872a76754fb8243a60
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
cb5c455ed1 -s ours am: b75f646c5c am: 19c906e43e Change-Id: I77d43a48f4301812332c0241bc3a49385521e447
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
cb5c455ed1 -s ours am: b75f646c5c Change-Id: Ie9e93d2df7ca12f1c851af863c881852cb762064
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-29 09:59:29 +0000