summaryrefslogtreecommitdiff
path: root/java/hiddenapi_singleton.go
diff options
context:
space:
mode:
author Martin Stjernholm <mast@google.com> 2021-05-26 16:57:39 +0100
committer Martin Stjernholm <mast@google.com> 2021-05-26 17:05:17 +0100
commitbe10503d3a53e3547e36e7bbe17f7661e925a950 (patch)
tree291e38f2958531e3b454b500ef741f66c3b158d2 /java/hiddenapi_singleton.go
parentbcf5304eaba149419905b2c8b5e21f2c168bdbbd (diff)
Drop "prebuilt_" prefixes from names registered in ApexInfo.InApexXxx.
Neither InApexVariants nor InApexModules should have them. This allows us to get rid of InApexVariantByBaseName as well. Test: m nothing Test: m nothing SOONG_CONFIG_art_module_source_build=false Bug: 180325915 Change-Id: Icbe4e025ce1a4c8dd258ff95d326ca2f27905188
Diffstat (limited to 'java/hiddenapi_singleton.go')
-rw-r--r--java/hiddenapi_singleton.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/hiddenapi_singleton.go b/java/hiddenapi_singleton.go
index bdf055abc..52934a327 100644
--- a/java/hiddenapi_singleton.go
+++ b/java/hiddenapi_singleton.go
@@ -171,7 +171,7 @@ func isModuleInConfiguredList(ctx android.BaseModuleContext, module android.Modu
// A platform variant is required but this is for an apex so ignore it.
return false
}
- } else if !apexInfo.InApexVariantByBaseName(requiredApex) {
+ } else if !apexInfo.InApexVariant(requiredApex) {
// An apex variant for a specific apex is required but this is the wrong apex.
return false
}