diff options
| author | 2024-05-08 22:28:05 +0000 | |
|---|---|---|
| committer | 2024-05-08 22:28:05 +0000 | |
| commit | 7eaf503cfd42a70f625405bb4a4b67eb5de47c8d (patch) | |
| tree | 538010b7947258f555d652310530ccf43905ce72 /java/hiddenapi_singleton.go | |
| parent | 2aff024c189e5217b102d7b307fddc6c303b1c38 (diff) | |
| parent | a3a05460b478ed59c527dec1c8b2efa61ce9c53c (diff) | |
Merge "Revert^2 "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 { |