summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-02-25Merge "Remove trailing whitespace in dexdump golden output." am: c8f2e4d20b ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r55android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16aml_go_odp_330912000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-releaseandroid13-mainline-go-adservices-releaseandroid13-frc-odp-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseTreehugger Robot
am: def0fd4b34 am: a91c5e462c Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1999014 Change-Id: I52d5bec70a17f053214563b8f0e2ff36e3fb5c1c
2022-02-25Merge "Remove trailing whitespace in dexdump golden output." am: c8f2e4d20b ↵Treehugger Robot
am: def0fd4b34 Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1999014 Change-Id: I4cae650637380812ffb068322312f77edcdc9e63
2022-02-25Merge "Remove trailing whitespace in dexdump golden output." am: c8f2e4d20bTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1999014 Change-Id: I20cae4c45f74d4d3888a0f6e36e2c48badff6638
2022-02-25Merge "Remove trailing whitespace in dexdump golden output."Treehugger Robot
2022-02-25Remove trailing whitespace in dexdump golden output.Martin Stjernholm
To make 137-dexmerger-dex38 pass after https://r.android.com/2000711. Test: m dexdump-host dalvik/dx/tests/run-test 137-dexmerger-dex38 Bug: 221424738 Change-Id: Ie1f8d691e6bdb71437e2c1643e2fb1995e652d56
2022-02-11[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8084891 am: 0098fb02bd -s ours am: 92d42df158 -s ours am skip reason: Merged-In I00d0a613a8a906ca90bb20d0bef553d4beb64373 with SHA-1 3d6710c5e3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/dalvik/+/16843643 Change-Id: Ide529bc7832d5bdd86c8eddd0af075d1ec88c652
2022-02-11[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8084891 am: 0098fb02bd -s ours am skip reason: Merged-In I00d0a613a8a906ca90bb20d0bef553d4beb64373 with SHA-1 3d6710c5e3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/dalvik/+/16843643 Change-Id: Iaed5274bb86d8d003018f81759bdfa085c11d0dc
2022-02-11Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891Xin Li
Bug: 214455710 Merged-In: I00d0a613a8a906ca90bb20d0bef553d4beb64373 Change-Id: I2699d232cbba93d256a04cb8773bfc42fcbbe496
2022-01-25Merge "Run dx tests with Java 11 by default" am: 373c201450 am: 0101247b92 ↵Orion Hodson
am: 3e46f0239f am: 266363dee4 Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1959189 Change-Id: Ibc56bfe0e6aa2bfd6a040a294be5b148bd7d0c7f
2022-01-25Merge "Run dx tests with Java 11 by default" am: 373c201450 am: 0101247b92 ↵Orion Hodson
am: 3e46f0239f Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1959189 Change-Id: I4ed001ec4e5475cd17fb99569fa1761896d6b205
2022-01-25Merge "Run dx tests with Java 11 by default" am: 373c201450 am: 0101247b92Orion Hodson
Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1959189 Change-Id: Id978b3fede36bbd915a0d2af29ac9dcfa7a2a41b
2022-01-25Merge "Run dx tests with Java 11 by default" am: 373c201450Orion Hodson
Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1959189 Change-Id: Iab55f209f472dbdd0ae16fe170499bd21f75f725
2022-01-25Merge "Run dx tests with Java 11 by default"android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Orion Hodson
2022-01-25Run dx tests with Java 11 by defaultSorin Basca
Test: cd dalvik && mma && dx/tests/run-all-tests Change-Id: I8c3c560e704ae700e22091b2cbcb2617123584cd
2022-01-20Merge "dx-tests: fixes and suppressions following java 11 switch" am: ↵Orion Hodson
06ee287673 am: 4038b63464 am: 3a1bbea144 am: abc69c7426 Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1956098 Change-Id: I730f91351f5e661d1e919cb149f9b76d8f9e031e
2022-01-20Merge "dx-tests: fixes and suppressions following java 11 switch" am: ↵Orion Hodson
06ee287673 am: 4038b63464 am: 3a1bbea144 Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1956098 Change-Id: I548f60f07febdb61a5b86aa4e8b1634e8abb2a1f
2022-01-20Merge "dx-tests: fixes and suppressions following java 11 switch" am: ↵Orion Hodson
06ee287673 am: 4038b63464 Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1956098 Change-Id: I69e7fbb7089e3702f5e479117f86c0c064489165
2022-01-20Merge "dx-tests: fixes and suppressions following java 11 switch" am: 06ee287673Orion Hodson
Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1956098 Change-Id: I31756ebfd392557cb9e09d40530044eab1882e8f
2022-01-20Merge "dx-tests: fixes and suppressions following java 11 switch"Orion Hodson
2022-01-20dx-tests: fixes and suppressions following java 11 switchOrion Hodson
Bug: 195387473 Test: dalvik/dx/run-all-tests Change-Id: Ib5d83e19fc3951e24ce7f6fc4098b3161b2dff08
2022-01-14Merge "Setting dx test to use Java 9" am: 056a3e43d1 am: ee8f3f0363 am: ↵Sorin Basca
44c89bcbce am: c6bc4fc43d Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1948558 Change-Id: Id7f15a0e172473e2795a9ad23f6dee6bf84c929f
2022-01-14Merge "Setting dx test to use Java 9" am: 056a3e43d1 am: ee8f3f0363 am: ↵Sorin Basca
44c89bcbce Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1948558 Change-Id: I1aa3293d7f732458e16b872966fc7edf3f393a29
2022-01-14Merge "Setting dx test to use Java 9" am: 056a3e43d1 am: ee8f3f0363Sorin Basca
Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1948558 Change-Id: I315b9c92a9e3c8aa6656dfd7e6c6bce0babc27bb
2022-01-14Merge "Setting dx test to use Java 9" am: 056a3e43d1Sorin Basca
Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1948558 Change-Id: I4917901aec30beb940f396f705ff6e1c3aee6950
2022-01-14Merge "Setting dx test to use Java 9"Sorin Basca
2022-01-13Setting dx test to use Java 9Sorin Basca
Test: atest DexMergerTest Bug: 195387473 Change-Id: I00d0a613a8a906ca90bb20d0bef553d4beb64373
2021-09-29Merge "Remove unused module dx-docs" am: 45364b9c55 am: ce1ffae499 am: ↵Orion Hodson
5d7d18dac3 am: 90cf56656b am: 9a86c4cf6d Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1838793 Change-Id: I7b70d9b82c02a26e7746d300d531d6e00cbe5859
2021-09-29Merge "Remove unused module dx-docs" am: 45364b9c55 am: ce1ffae499 am: ↵Orion Hodson
5d7d18dac3 am: 90cf56656b Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1838793 Change-Id: Id5ed39ca1236aeaec7151a1df4312e1fd72a8044
2021-09-29Merge "Remove unused module dx-docs" am: 45364b9c55 am: ce1ffae499 am: ↵Orion Hodson
5d7d18dac3 Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1838793 Change-Id: I6c048916d540b4aef3ccc607f20880233d2735bf
2021-09-29Merge "Remove unused module dx-docs" am: 45364b9c55 am: ce1ffae499Orion Hodson
Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1838793 Change-Id: I64dd5f15f040cb7dfaca0f3735fee3f34e3e863f
2021-09-29Merge "Remove unused module dx-docs" am: 45364b9c55android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Orion Hodson
Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1838793 Change-Id: I50f966ec6e45fbba6d860f84590336abde63777f
2021-09-29Merge "Remove unused module dx-docs"Orion Hodson
2021-09-28Remove unused module dx-docsChihYao Chien
Bug: 194254430 Test: TH Change-Id: Iff96e7e160f5a9b2a04d0fe9be1bba27608df94a
2021-09-23Merge "Remove mainDexClasses" am: 35035f0682 am: abbf25246d am: 972714a198 ↵Colin Cross
am: b4579e99da am: f24612c1d4 Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1833067 Change-Id: I3ad3df4aee223a28bbb89e445295f873725dbfa1
2021-09-23Merge "Remove mainDexClasses" am: 35035f0682 am: abbf25246d am: 972714a198 ↵Colin Cross
am: b4579e99da Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1833067 Change-Id: I87877505537abccffb05a578d8ac23c1e380c544
2021-09-23Merge "Remove mainDexClasses" am: 35035f0682 am: abbf25246d am: 972714a198Colin Cross
Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1833067 Change-Id: I81403ecb2227a541292920d4afa39897925611ec
2021-09-23Merge "Remove mainDexClasses" am: 35035f0682 am: abbf25246dColin Cross
Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1833067 Change-Id: I2617893f2fe4056e5b41399bf636d24e0d7dc8a1
2021-09-23Merge "Remove mainDexClasses" am: 35035f0682Colin Cross
Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1833067 Change-Id: I0ba3da4c88c63c6edf06f78f83e46c1e89de881f
2021-09-23Merge "Remove mainDexClasses"Colin Cross
2021-09-22Remove mainDexClassesColin Cross
The last user was removed in Ia88660550c3e57749b8ccb154e97c31aaf2fcf3a. The rest of dalvik/Android.mk seems obsolete, remove it too. Test: m checkbuild Change-Id: I8615cebb3ef9f0f5d093cf40937f8a74467671b4
2021-09-20Merge "Export mainDexClasses*.rules for MultiDexLegacy tests" am: 8ec286ef38 ↵Colin Cross
am: 8a1ce8888c am: 5f7ba6458f am: 7415ea4c68 am: d8905ce25b Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1828916 Change-Id: I628aa8fb174467528a8b16b91680892ce0743515
2021-09-20Merge "Export mainDexClasses*.rules for MultiDexLegacy tests" am: 8ec286ef38 ↵Colin Cross
am: 8a1ce8888c am: 5f7ba6458f am: 7415ea4c68 Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1828916 Change-Id: Id4455536fddcb60ee6f55b0aebc5e40799cc9bcd
2021-09-20Merge "Export mainDexClasses*.rules for MultiDexLegacy tests" am: 8ec286ef38 ↵Colin Cross
am: 8a1ce8888c am: 5f7ba6458f Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1828916 Change-Id: I2dd3c063594ecebc31d22441d7e204d154c4a6f6
2021-09-20Merge "Export mainDexClasses*.rules for MultiDexLegacy tests" am: 8ec286ef38 ↵Colin Cross
am: 8a1ce8888c Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1828916 Change-Id: I70a262fe6ee39e556b8a8a8557d2389a537f9eb1
2021-09-20Merge "Export mainDexClasses*.rules for MultiDexLegacy tests" am: 8ec286ef38Colin Cross
Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1828916 Change-Id: I5d5c16eb228aa662b4cc792aa6b241a6fb7645a0
2021-09-20Merge "Export mainDexClasses*.rules for MultiDexLegacy tests"Colin Cross
2021-09-16Export mainDexClasses*.rules for MultiDexLegacy testsColin Cross
Test: m checkbuild Change-Id: Iccaa7a1610f7640d0e1f95764a7ba510a4aa82b1
2021-08-05Merge "Move jasmin build rules from make to soong" am: 50eca579ef am: ↵David Srbecky
d1f296276d am: 0774634456 am: 62812b58d5 Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1784572 Change-Id: I50f1c12ac7b6b5f586253670571c613de274e351
2021-08-05Merge "Move jasmin build rules from make to soong" am: 50eca579ef am: ↵David Srbecky
d1f296276d am: 0774634456 Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1784572 Change-Id: Iea2ede190ab814c0be1c2d269d88c8523f041e26
2021-08-05Merge "Move jasmin build rules from make to soong" am: 50eca579ef am: d1f296276dDavid Srbecky
Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1784572 Change-Id: If9245db8772659ef669dade5a3d726d5b3fa45ea
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-16 09:51:06 +0000