summaryrefslogtreecommitdiff
path: root/java/hiddenapi_modular.go
diff options
context:
space:
mode:
author Paul Duffin <paulduffin@google.com> 2021-06-17 19:33:24 +0100
committer Paul Duffin <paulduffin@google.com> 2021-06-17 19:33:24 +0100
commit7f8721618cbdcd169694d980cd598d0b80ef9629 (patch)
treef9787b21a3d456ee2b5a6c64b059c97974b94627 /java/hiddenapi_modular.go
parent4aea00ec18c6c5a82bd74be934ba5edbfdd123f1 (diff)
Exclude jacocoagent from boot jars package check
This replicates the previous behavior when the boot jars package check was performed by a singleton. When the singleton was removed and the check was performed by the platform-bootclasspath the logic to exclude jacocoagent from the list was lost. This change replaces it. Bug: 191377804 Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true check-boot-jars - fails without this change passes with this change. Change-Id: If9eae254045bef9a0c0963213721fc12a9f463cb
Diffstat (limited to 'java/hiddenapi_modular.go')
-rw-r--r--java/hiddenapi_modular.go13
1 files changed, 13 insertions, 0 deletions
diff --git a/java/hiddenapi_modular.go b/java/hiddenapi_modular.go
index 60300afe1..de72b39aa 100644
--- a/java/hiddenapi_modular.go
+++ b/java/hiddenapi_modular.go
@@ -589,6 +589,19 @@ func (b bootDexJarByModule) bootDexJars() android.Paths {
return paths
}
+// bootDexJarsWithoutCoverage returns the boot dex jar paths sorted by their keys without coverage
+// libraries if present.
+func (b bootDexJarByModule) bootDexJarsWithoutCoverage() android.Paths {
+ paths := android.Paths{}
+ for _, k := range android.SortedStringKeys(b) {
+ if k == "jacocoagent" {
+ continue
+ }
+ paths = append(paths, b[k])
+ }
+ return paths
+}
+
// HiddenAPIOutput encapsulates the output from the hidden API processing.
type HiddenAPIOutput struct {
HiddenAPIFlagOutput