diff options
| author | Paul Duffin <paulduffin@google.com> | 2021-05-14 16:35:06 +0100 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2021-05-18 07:59:41 +0100 |
| commit | 59190602afc97954e18c266b516c1287b43e1657 (patch) | |
| tree | 504d90616437a4ddf5359725fafa7306b15c4611 /java/java.go | |
| parent | 78fc68695edd70a834af9163b2bf56a35cfaa385 (diff) | |
Remove configurationName from java library and hidden API
The configurationName was intended to separate the name of the module
from the name used in configuration (such as BootJars) so that the
child implementation library of a java_sdk_library on the bootclasspath
would have hidden API encoding performed on it just as for the main
java_library embedded within the java_sdk_library.
While that did use to work it no longer does as the test added in the
preceding change proves. It is not surprising that this regression does
not appear to have caused any issues as the the child implementation
library is only a build time artifact and not used at runtime.
In future the only modules that will require hidden API encoding are
those that are part of a bootclasspath module so there is no point in
maintaining this capability.
Bug: 179354495
Test: m droid
Merged-In: Ief8136fa9e98600cdd8d36108ec22edc2ebd7c69
Change-Id: Ief8136fa9e98600cdd8d36108ec22edc2ebd7c69
(cherry picked from commit 66cdbf07ef2af6caf42e2c7b77b1a5fb86a4cee3)
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/java/java.go b/java/java.go index f85de3d77..515d20429 100644 --- a/java/java.go +++ b/java/java.go @@ -481,10 +481,8 @@ func shouldUncompressDex(ctx android.ModuleContext, dexpreopter *dexpreopter) bo } func (j *Library) GenerateAndroidBuildActions(ctx android.ModuleContext) { - // Initialize the hiddenapi structure. Pass in the configuration name rather than the module name - // so the hidden api will encode the <x>.impl java_ library created by java_sdk_library just as it - // would the <x> library if <x> was configured as a boot jar. - j.initHiddenAPI(ctx, j.ConfigurationName()) + // Initialize the hiddenapi structure. + j.initHiddenAPI(ctx) j.sdkVersion = j.SdkVersion(ctx) j.minSdkVersion = j.MinSdkVersion(ctx) @@ -1242,7 +1240,7 @@ func (j *Import) GenerateAndroidBuildActions(ctx android.ModuleContext) { j.minSdkVersion = j.MinSdkVersion(ctx) // Initialize the hiddenapi structure. - j.initHiddenAPI(ctx, j.BaseModuleName()) + j.initHiddenAPI(ctx) if !ctx.Provider(android.ApexInfoProvider).(android.ApexInfo).IsForPlatform() { j.hideApexVariantFromMake = true |