summaryrefslogtreecommitdiff
path: root/java/code_metadata_test.go
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2023-07-18 15:57:09 -0700
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> 2024-02-19 13:01:34 +0000
commit1e1f0188c14be86d18032e60e9e287fc6a94a3de (patch)
treed0904ac3de6b6a7ab5e3c171d7af03a5ee35398c /java/code_metadata_test.go
parent9bc4228f88178dbbef1f012afaeaa1318a0f9f77 (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 (cherry picked from commit 7592d5a0bdec6848b1679eb29a28eb8dddfe4c87) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:47efcdcf6bc845608f137df06d3b1d4426088839) Merged-In: I69f80d1265c64c671d308ef4cdccfa1564abe056 Change-Id: I69f80d1265c64c671d308ef4cdccfa1564abe056
Diffstat (limited to 'java/code_metadata_test.go')
0 files changed, 0 insertions, 0 deletions