diff options
| author | 2024-05-06 21:06:54 +0000 | |
|---|---|---|
| committer | 2024-05-06 21:06:54 +0000 | |
| commit | f91daab1ab4ca42e22acbeae349582d3e666c57f (patch) | |
| tree | b96bcc3088fe40e14dbeaf02f2f06367c49f4f62 /java/hiddenapi_singleton.go | |
| parent | be83e748d4b2918fb1956ef66479c51b5c2c928e (diff) | |
| parent | d831af426762a24794f3420ba00eb1b388cea221 (diff) | |
Merge "Remove compilation actions from java sdk library" into main
Diffstat (limited to 'java/hiddenapi_singleton.go')
| -rw-r--r-- | java/hiddenapi_singleton.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/java/hiddenapi_singleton.go b/java/hiddenapi_singleton.go index 8cb78cd54..7d21b7a61 100644 --- a/java/hiddenapi_singleton.go +++ b/java/hiddenapi_singleton.go @@ -150,6 +150,10 @@ func isModuleInConfiguredList(ctx android.BaseModuleContext, module android.Modu // Strip a prebuilt_ prefix so that this can match a prebuilt module that has not been renamed. name = android.RemoveOptionalPrebuiltPrefix(name) + // Strip the ".impl" suffix, so that the implementation library of the java_sdk_library is + // treated identical to the top level java_sdk_library. + name = strings.TrimSuffix(name, ".impl") + // Ignore any module that is not listed in the boot image configuration. index := configuredBootJars.IndexOfJar(name) if index == -1 { |