summaryrefslogtreecommitdiff
path: root/java/java.go
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2023-07-18 15:57:09 -0700
committer Colin Cross <ccross@android.com> 2023-07-26 23:39:46 +0000
commit47efcdcf6bc845608f137df06d3b1d4426088839 (patch)
tree27f6d50d15f0aac34de380af06a50f837d38e490 /java/java.go
parentd3b1b77184b1c002136039e70074899a35b1ed77 (diff)
Merge META-INF/services/* files in merge_zips -jar
kotlinx_coroutines_test and kotlinx_coroutine_android each provide a META-INF/services/kotlinx.coroutines.CoroutineExceptionHandler with different contents, and the final contents needs to be the combination of the two files. Implement service merging in merge_zips when the -jar argument is provided. Bug: 290933559 Test: TestMergeZips Change-Id: I69f80d1265c64c671d308ef4cdccfa1564abe056 Merged-In: I69f80d1265c64c671d308ef4cdccfa1564abe056 (cherry picked from commit 7592d5a0bdec6848b1679eb29a28eb8dddfe4c87)
Diffstat (limited to 'java/java.go')
0 files changed, 0 insertions, 0 deletions