summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-04-08Merge "Fix build error due to null annotations in core platform API" am: ↵android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devPaul Duffin
ddbce35345 am: 8ec9292427 am: c311b4859d Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1670005 Change-Id: Id88ffd24b071e2faddeea67b522ff665f4c25549
2021-04-08Merge "Fix build error due to null annotations in core platform API" am: ↵temp_ab_7272582Paul Duffin
ddbce35345 am: 8ec9292427 Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1670005 Change-Id: I9d6e8649e7f4727dd30dbdb3f9ce153616f8e628
2021-04-08Merge "Fix build error due to null annotations in core platform API" am: ↵Paul Duffin
ddbce35345 Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1670005 Change-Id: I741aef69b5cf2fb7710711ab97cc6b3b25b8c036
2021-04-08Merge "Fix build error due to null annotations in core platform API"android-s-beta-2android-s-beta-1Paul Duffin
2021-04-08Fix build error due to null annotations in core platform APIPaul Duffin
Change https://r.android.com/1667508 adds nullability annotations to the core platform APIs which broke this code with the error: com.sun.tools.javac.code.Symbol$CompletionFailure: class file for androidx.annotation.RecentlyNonNull not found This change adds the stub-annotations library to provide the definition for that class. Bug: 183938110 Test: m checkbuild Change-Id: I8f9560aaa314a47d85b8d4c33c8fe285b2eba194
2021-02-24Merge "Attempt to fix dx-tests to run in CI as a unit tests" am: 27d7b79d6d ↵Julien Desprez
am: 808547956e am: fadc7b0701 Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1601095 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I86d45c91e4659aa50b65db776a2e1bb78eef7090
2021-02-24Merge "Attempt to fix dx-tests to run in CI as a unit tests" am: 27d7b79d6d ↵Julien Desprez
am: 808547956e Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1601095 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4368af76b63776d18e4894ce7d7c107f3fa3be82
2021-02-24Merge "Attempt to fix dx-tests to run in CI as a unit tests" am: 27d7b79d6dJulien Desprez
Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1601095 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I95974304d07396b11ebb00a9511f5389cc3ff810
2021-02-24Merge "Attempt to fix dx-tests to run in CI as a unit tests"Julien Desprez
2021-02-23Attempt to fix dx-tests to run in CI as a unit testsJulien Desprez
Change-Id: Ie8f5959dc22dcf150ed77bb970e6e36b9159eeba Test: presubmit Bug: 180736967
2021-02-22Merge "[LSC] Add LOCAL_LICENSE_KINDS to dalvik" am: 120c5bf00b am: ↵Treehugger Robot
45bba9ec66 am: bd1a5f3fb8 Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1588394 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I360c786dc9abe64609eaf3d0875b9bd33bbf45e0
2021-02-22Merge "[LSC] Add LOCAL_LICENSE_KINDS to dalvik" am: 120c5bf00b am: 45bba9ec66Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1588394 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9c7806df2df5054a174cb15f4293a5b9ba8d94f0
2021-02-22Merge "[LSC] Add LOCAL_LICENSE_KINDS to dalvik" am: 120c5bf00bTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1588394 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib2861e069d027808e51b673e904d7cfed74ca72f
2021-02-22Merge "[LSC] Add LOCAL_LICENSE_KINDS to dalvik"Treehugger Robot
2021-02-21[LSC] Add LOCAL_LICENSE_KINDS to dalvikBob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp dexgen/Android.bp dx/Android.bp dx/Android.mk dx/junit-tests/Android.bp dx/src/Android.bp tools/dexdeps/Android.bp tools/dexdeps/src/Android.bp tools/hprof-conv/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I6a9f330a68db4eb09b11a0a5fb876721a8857aa7 Merged-in: I6a9f330a68db4eb09b11a0a5fb876721a8857aa7
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: cf5879a19d -s ↵Xin Li
ours am: 614a8f1d22 -s ours am skip reason: Change-Id I79a32e1e7e4ec81b98fe196909ebb7b1ea307c0c with SHA-1 fe82a47e60 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I45e44a3316522ee490c6e2c846b56e8af08c7a5b
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: cf5879a19d -s oursXin Li
am skip reason: Change-Id I79a32e1e7e4ec81b98fe196909ebb7b1ea307c0c with SHA-1 fe82a47e60 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6017c92170936154e78251c692f69e6a703751a7
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: I79a32e1e7e4ec81b98fe196909ebb7b1ea307c0c Change-Id: Ia1dfc0b987e1ac150c66ec496e528ad218bf2330
2021-01-20[automerger skipped] Update bat files to not use find_java.bat am: ↵Joe Baker-Malone
da7b74d9cc am: 5bac3bb5ca -s ours am: 027cd0bce4 -s ours am skip reason: Change-Id Idec6abc042efc10dffd3cc718b798134954daf58 with SHA-1 da7b74d9cc is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/dalvik/+/13366650 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7dc8e6fea2400d2940dc3e6c02948d1b791e4066
2021-01-20[automerger skipped] Update bat files to not use find_java.bat am: ↵Joe Baker-Malone
da7b74d9cc am: 5bac3bb5ca -s ours am skip reason: Change-Id Idec6abc042efc10dffd3cc718b798134954daf58 with SHA-1 83bf7f30a7 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/dalvik/+/13366650 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I20d4a6ae2b3a5fde0c650cabeb5c1fec080bc3f2
2021-01-20[automerger skipped] Update bat files to not use find_java.bat am: ↵Joe Baker-Malone
da7b74d9cc am: 100eea6231 -s ours am skip reason: Change-Id Idec6abc042efc10dffd3cc718b798134954daf58 with SHA-1 83bf7f30a7 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/dalvik/+/13366650 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I38c287e21fbf08f3fd4d87838eb02e694d60eeca
2021-01-20Update bat files to not use find_java.bat am: da7b74d9ccJoe Baker-Malone
Original change: https://googleplex-android-review.googlesource.com/c/platform/dalvik/+/13366650 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I424c1ef11547d061d97da79ffab6445e78bbf8a0
2021-01-20Update bat files to not use find_java.bat am: da7b74d9ccJoe Baker-Malone
Original change: https://googleplex-android-review.googlesource.com/c/platform/dalvik/+/13366650 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I64bebe2bf0df78a16637ddcbd166d3b76f94316c
2021-01-19Update bat files to not use find_java.batJoe Baker-Malone
find_java.bat is in the deprecated "tools" component and should no longer be used. Switching to just looking for what's on the path or in JAVA_HOME, as other tools do. Bug: 150888434 Test: none Change-Id: Idec6abc042efc10dffd3cc718b798134954daf58 Merged-In: Idec6abc042efc10dffd3cc718b798134954daf58
2020-11-24Mark ab/6881855 as merged am: 35e485b68a am: fe82a47e60Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/dalvik/+/13111882 Change-Id: I3c730232aae3245e1401db812d2bf9094867472b
2020-11-24Mark ab/6881855 as merged am: 35e485b68aXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/dalvik/+/13111882 Change-Id: I79a32e1e7e4ec81b98fe196909ebb7b1ea307c0c
2020-11-23Mark ab/6881855 as mergedandroid-s-preview-1Xin Li
Bug: 172690556 Change-Id: I323eab101afcaf2acfb13d56c88440ab9b8fd05c
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 566e171bb4 -s ours am: ↵Xin Li
d912af261a -s ours am: 240cdc7501 -s ours am skip reason: Change-Id If91d52bca496745c61f3bbaf0bbd4d011350e065 with SHA-1 8641a11429 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/dalvik/+/12796460 Change-Id: Iedd38d0000b4f55161af6401b41e8da501c7f941
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 566e171bb4 -s ours am: ↵Xin Li
d912af261a -s ours am skip reason: Change-Id If91d52bca496745c61f3bbaf0bbd4d011350e065 with SHA-1 8641a11429 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/dalvik/+/12796460 Change-Id: Ia8ef9125c38da095714bb77ebe96b248059f86da
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 566e171bb4 -s oursXin Li
am skip reason: Change-Id If91d52bca496745c61f3bbaf0bbd4d011350e065 with SHA-1 8641a11429 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/dalvik/+/12796460 Change-Id: I534aa16b93dc9726efcf3c7e3f0d59c4af731cbb
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: If91d52bca496745c61f3bbaf0bbd4d011350e065 Change-Id: I2d038114bbd5879c1cfb9322f2502468b83279a8
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: f73f651cea -s ours am: 63265a9edd -s ours am: eae156d2fc -s ours am: 32589bc4da -s ours am skip reason: Change-Id I05c47d4b3a675cf3424565c8d576fca8fe1f95dc with SHA-1 913f3732fa is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/dalvik/+/12469439 Change-Id: I57d533f656d14be730cba0e8ad32742142b74417
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: f73f651cea -s ours am: 63265a9edd -s ours am: eae156d2fc -s ours am skip reason: Change-Id I05c47d4b3a675cf3424565c8d576fca8fe1f95dc with SHA-1 913f3732fa is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/dalvik/+/12469439 Change-Id: I70402080ff96da86eece36a334dc76f39ae7f837
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: f73f651cea -s ours am: 63265a9edd -s ours am skip reason: Change-Id I05c47d4b3a675cf3424565c8d576fca8fe1f95dc with SHA-1 913f3732fa is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/dalvik/+/12469439 Change-Id: Ie213ed4e47cd8f361ce737b9b9a06b15d586483b
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: f73f651cea -s ours am skip reason: Change-Id I05c47d4b3a675cf3424565c8d576fca8fe1f95dc with SHA-1 913f3732fa is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/dalvik/+/12469439 Change-Id: I6ce5dc7dd97ebd7e965d483b00cd0d2c7b0cb64f
2020-08-27Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as mergedXin Li
Bug: 166295507 Merged-In: I05c47d4b3a675cf3424565c8d576fca8fe1f95dc Change-Id: Ia508d0879383ddc977698f877c828c68fe98884c
2020-08-03Merge "Remove `create_stubs: false` from droiddoc" am: f9ab924fb7 am: ↵Treehugger Robot
8ea87f3397 am: af51fdf4a8 am: 8641a11429 am: 8a7e0ca848 Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1384461 Change-Id: I7fef81256638d990157ddd4a59f40a9c8b0c096a
2020-08-03Merge "Remove `create_stubs: false` from droiddoc" am: f9ab924fb7 am: ↵Treehugger Robot
8ea87f3397 am: af51fdf4a8 am: 8641a11429 Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1384461 Change-Id: I64b924acd6386f47748860a5ec066df83388cb43
2020-08-03Merge "Remove `create_stubs: false` from droiddoc" am: f9ab924fb7 am: ↵Treehugger Robot
8ea87f3397 am: af51fdf4a8 Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1384461 Change-Id: If91d52bca496745c61f3bbaf0bbd4d011350e065
2020-08-03Merge "Remove `create_stubs: false` from droiddoc" am: f9ab924fb7 am: 8ea87f3397Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1384461 Change-Id: I5c8dd0d7df663d2cf1f86825bc8e548df30a14ba
2020-08-03Merge "Remove `create_stubs: false` from droiddoc" am: f9ab924fb7Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1384461 Change-Id: I10e64b1eed23bbea3d32c6faadeef4375bce7526
2020-08-03Merge "Remove `create_stubs: false` from droiddoc"Treehugger Robot
2020-07-31Remove `create_stubs: false` from droiddocLiz Kammer
`create_stubs: false` is the default behavior in soong as of https://r.android.com/1380730 Test: m dx-docs Test: m dexdeps-docs Bug: 144248501 Bug: 143136634 Change-Id: I5f1f46f4b108104278d7ab01cef2b3b9a395c7a3
2020-07-31Merge "Update OWNERS list" am: e7d81cd936 am: 07f5bff5be am: fd7bc1b682 am: ↵Orion Hodson
b3e6a395af am: dd17435902 Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1376380 Change-Id: Id094465a2020b69854eca9370e4999995a7c40e2
2020-07-31Merge "Update OWNERS list" am: e7d81cd936 am: 07f5bff5be am: fd7bc1b682 am: ↵Orion Hodson
b3e6a395af Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1376380 Change-Id: I29d18102d24e34dad75aa37f6a0cc09665cac286
2020-07-30Merge "Update OWNERS list" am: e7d81cd936 am: 07f5bff5be am: fd7bc1b682Orion Hodson
Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1376380 Change-Id: I6df813f5b2cfa6cc4f861dc116f2faec16729aae
2020-07-30Merge "Update OWNERS list" am: e7d81cd936 am: 07f5bff5beOrion Hodson
Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1376380 Change-Id: I06e8a3f20e2f42d737531b169c54bb65c5628843
2020-07-30Merge "Update OWNERS list" am: e7d81cd936Orion Hodson
Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1376380 Change-Id: I340eb433f2507a86a0a35654c0777c02ed6d9fdd
2020-07-30Merge "Update OWNERS list"Orion Hodson
2020-07-29Merge "Inclusive language updates" am: c634c04b70 am: 92442f41e9 am: ↵Treehugger Robot
93218ed0b5 am: 815be0fe81 am: e67697a260 Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1376376 Change-Id: Ieee6141935bb3c21180b8c927256a156dc59fa3e
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 14:05:47 +0000