| commit | c4f4cedc4795f5bc77553c5c3f6244192f01b298 | [log] [tgz] |
|---|---|---|
| author | Martin Stjernholm <mast@google.com> | Thu May 27 11:17:00 2021 +0000 |
| committer | Martin Stjernholm <mast@google.com> | Thu May 27 17:23:16 2021 +0000 |
| tree | 080ef4790003a19b49cef593e7df3e88b63e84e9 | |
| parent | ae5072fac3054c266a193d4e50a24c74d0fa16d0 [diff] [blame] |
Merge "Drop "prebuilt_" prefixes from names registered in ApexInfo.InApexXxx." Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1719298 Bug: 180325915 Change-Id: I1fd96bad2326612d153fed31308914902f58d3ec Merged-In: Icbe4e025ce1a4c8dd258ff95d326ca2f27905188 (cherry picked from commit f4c44417a3c769be884ee1c2bdcd95689b5cecb4)
diff --git a/java/hiddenapi_singleton.go b/java/hiddenapi_singleton.go index bdf055a..52934a3 100644 --- a/java/hiddenapi_singleton.go +++ b/java/hiddenapi_singleton.go
@@ -171,7 +171,7 @@ // 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 }