diff options
| author | 2023-07-18 15:57:09 -0700 | |
|---|---|---|
| committer | 2023-07-20 18:59:35 +0000 | |
| commit | 7592d5a0bdec6848b1679eb29a28eb8dddfe4c87 (patch) | |
| tree | 82d2b8f869979cd0904ed37f49f1a87125362507 /third_party/zip/android.go | |
| parent | f06d8dc8e3816cef2d3c0ba072ad1fc24bc44de0 (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
Diffstat (limited to 'third_party/zip/android.go')
| -rw-r--r-- | third_party/zip/android.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/zip/android.go b/third_party/zip/android.go index f8e45c56d..0f41f6200 100644 --- a/third_party/zip/android.go +++ b/third_party/zip/android.go @@ -170,7 +170,7 @@ func (w *Writer) CreateCompressedHeader(fh *FileHeader) (io.WriteCloser, error) func (w *Writer) CreateHeaderAndroid(fh *FileHeader) (io.Writer, error) { writeDataDescriptor := fh.Method != Store if writeDataDescriptor { - fh.Flags &= DataDescriptorFlag + fh.Flags |= DataDescriptorFlag } else { fh.Flags &= ^uint16(DataDescriptorFlag) } |