diff options
Diffstat (limited to 'java/hiddenapi.go')
| -rw-r--r-- | java/hiddenapi.go | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/java/hiddenapi.go b/java/hiddenapi.go index 104cd767..51ed3dda 100644 --- a/java/hiddenapi.go +++ b/java/hiddenapi.go @@ -57,14 +57,7 @@ func (h *hiddenAPI) hiddenAPI(ctx android.ModuleContext, dexJar android.ModuleOu if !ctx.Config().IsEnvTrue("UNSAFE_DISABLE_HIDDENAPI_FLAGS") { isBootJar := inList(ctx.ModuleName(), ctx.Config().BootJars()) - // Check to see if this module provides part of the hiddenapi, i.e. is a boot jar or a white listed - // library. - isProvidingJar := isBootJar || inList(ctx.ModuleName(), config.HiddenAPIProvidingNonBootJars) - - // If this module provides part of the hiddenapi or is a special module that simply provides information - // about the hiddenapi then extract information about the hiddenapi from the UnsupportedAppUsage - // annotations compiled into the classes.jar. - if isProvidingJar || inList(ctx.ModuleName(), config.HiddenAPIExtraAppUsageJars) { + if isBootJar || inList(ctx.ModuleName(), config.HiddenAPIExtraAppUsageJars) { // Derive the greylist from classes jar. flagsCSV := android.PathForModuleOut(ctx, "hiddenapi", "flags.csv") metadataCSV := android.PathForModuleOut(ctx, "hiddenapi", "metadata.csv") @@ -72,10 +65,7 @@ func (h *hiddenAPI) hiddenAPI(ctx android.ModuleContext, dexJar android.ModuleOu h.flagsCSVPath = flagsCSV h.metadataCSVPath = metadataCSV } - - // If this module provides part of the hiddenapi then encode the information about the hiddenapi into - // the dex file created for this module. - if isProvidingJar { + if isBootJar { hiddenAPIJar := android.PathForModuleOut(ctx, "hiddenapi", ctx.ModuleName()+".jar") h.bootDexJarPath = dexJar hiddenAPIEncodeDex(ctx, hiddenAPIJar, dexJar, uncompressDex) |