summaryrefslogtreecommitdiff
path: root/java/java.go
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2017-11-22 14:09:40 -0800
committer Colin Cross <ccross@android.com> 2017-11-22 16:08:35 -0800
commite909e1e0796ab87e4ad32ac12d848263186ef77b (patch)
tree1e71674b25039f406573ac6182a0bb66ab1516de /java/java.go
parentf3831d0e0831c201406a959f40196eaabf243569 (diff)
Add support for --ignore_duplicates to merge_zips
Add a --ignore_duplicates option to cause merge_zips to silently take the first entry in the case of duplicate entries in the zips to be merged. This will be used for soong Jacoco support to combine the instrumented jar with the original jar to pick up any classes that were excluded. Bug: 69629238 Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true SKIP_BOOT_JARS_CHECK=true WITH_DEXPREOPT=false Change-Id: I49ede3f07ce0ed7701b4db7058da2e4f11b8043e
Diffstat (limited to 'java/java.go')
0 files changed, 0 insertions, 0 deletions