commit 7592d5a0bdec6848b1679eb29a28eb8dddfe4c87
author Colin Cross <ccross@android.com> Tue Jul 18 15:57:09 2023 -0700
committer Colin Cross <ccross@android.com> Thu Jul 20 18:59:35 2023 +0000
tree 82d2b8f869979cd0904ed37f49f1a87125362507
parent f06d8dc8e3816cef2d3c0ba072ad1fc24bc44de0

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

jar/Android.bp

diff --git a/jar/Android.bp b/jar/Android.bp
index 46113d8..c03e491 100644
--- a/jar/Android.bp
+++ b/jar/Android.bp
@@ -21,6 +21,7 @@
     pkgPath: "android/soong/jar",
     srcs: [
         "jar.go",
+        "services.go",
     ],
     testSrcs: [
         "jar_test.go",