Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 1e1f0188 authored by Colin Cross's avatar Colin Cross Committed by Cherrypicker Worker
Browse files

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 7592d5a0)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:47efcdcf6bc845608f137df06d3b1d4426088839)
Merged-In: I69f80d1265c64c671d308ef4cdccfa1564abe056
Change-Id: I69f80d1265c64c671d308ef4cdccfa1564abe056
parent 9bc4228f
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment