diff options
Diffstat (limited to 'java/hiddenapi.go')
| -rw-r--r-- | java/hiddenapi.go | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/java/hiddenapi.go b/java/hiddenapi.go index c9a1f2bbe..fe2521cca 100644 --- a/java/hiddenapi.go +++ b/java/hiddenapi.go @@ -44,8 +44,7 @@ type hiddenAPI struct { // // This must be the path to the unencoded dex jar as the encoded dex jar indirectly depends on // this file so using the encoded dex jar here would result in a cycle in the ninja rules. - bootDexJarPath OptionalDexJarPath - bootDexJarPathErr error + bootDexJarPath OptionalDexJarPath // The paths to the classes jars that contain classes and class members annotated with // the UnsupportedAppUsage annotation that need to be extracted as part of the hidden API @@ -57,10 +56,7 @@ type hiddenAPI struct { uncompressDexState *bool } -func (h *hiddenAPI) bootDexJar(ctx android.ModuleErrorfContext) OptionalDexJarPath { - if h.bootDexJarPathErr != nil { - ctx.ModuleErrorf(h.bootDexJarPathErr.Error()) - } +func (h *hiddenAPI) bootDexJar() OptionalDexJarPath { return h.bootDexJarPath } @@ -81,7 +77,7 @@ type hiddenAPIModule interface { } type hiddenAPIIntf interface { - bootDexJar(ctx android.ModuleErrorfContext) OptionalDexJarPath + bootDexJar() OptionalDexJarPath classesJars() android.Paths uncompressDex() *bool } @@ -131,11 +127,6 @@ func (h *hiddenAPI) initHiddenAPI(ctx android.ModuleContext, dexJar OptionalDexJ h.active = isModuleInBootClassPath(ctx, module) } -// Store any error encountered during the initialization of hiddenapi structure (e.g. unflagged co-existing prebuilt apexes) -func (h *hiddenAPI) initHiddenAPIError(err error) { - h.bootDexJarPathErr = err -} - func isModuleInBootClassPath(ctx android.BaseModuleContext, module android.Module) bool { // Get the configured platform and apex boot jars. nonApexBootJars := ctx.Config().NonApexBootJars() |