diff options
| author | 2021-07-26 17:59:36 +0000 | |
|---|---|---|
| committer | 2021-07-26 17:59:36 +0000 | |
| commit | 4102c0cc47f58c5278852641ab1636920a59ab48 (patch) | |
| tree | 075b77d44e1a389c5305277c2dfae7806fe6a344 /java/hiddenapi.go | |
| parent | b643c7a085de5b03c4f746812a2455fb98d88161 (diff) | |
| parent | d604b210c40772a72d6533804a4da53a480c6373 (diff) | |
Merge "Rename UpdatableBootJars to ApexBootJars."
Diffstat (limited to 'java/hiddenapi.go')
| -rw-r--r-- | java/hiddenapi.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/java/hiddenapi.go b/java/hiddenapi.go index f901434a0..30683daa0 100644 --- a/java/hiddenapi.go +++ b/java/hiddenapi.go @@ -118,11 +118,11 @@ func (h *hiddenAPI) initHiddenAPI(ctx android.ModuleContext, dexJar, classesJar } func isModuleInBootClassPath(ctx android.BaseModuleContext, module android.Module) bool { - // Get the configured non-updatable and updatable boot jars. - nonUpdatableBootJars := ctx.Config().NonUpdatableBootJars() - updatableBootJars := ctx.Config().UpdatableBootJars() - active := isModuleInConfiguredList(ctx, module, nonUpdatableBootJars) || - isModuleInConfiguredList(ctx, module, updatableBootJars) + // Get the configured platform and apex boot jars. + nonApexBootJars := ctx.Config().NonApexBootJars() + apexBootJars := ctx.Config().ApexBootJars() + active := isModuleInConfiguredList(ctx, module, nonApexBootJars) || + isModuleInConfiguredList(ctx, module, apexBootJars) return active } |