Merge initHiddenAPI and hiddenAPIUpdatePaths

These two methods did very similar jobs and merging them together
simplifies the behavior.

Bug: 179354495
Test: m droid
Change-Id: Ibe1a23d54105e6a0e5693079cd8743679301fc85
This commit is contained in:
Paul Duffin
2021-05-14 14:18:47 +01:00
parent 66cdbf07ef
commit 74d18d1d6f
4 changed files with 26 additions and 36 deletions

View File

@@ -1217,8 +1217,8 @@ func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar android.Path) {
return
}
// Update hidden API paths.
j.hiddenAPIUpdatePaths(ctx, dexOutputFile, j.implementationJarFile)
// Initialize the hiddenapi structure.
j.initHiddenAPI(ctx, dexOutputFile, j.implementationJarFile)
// Encode hidden API flags in dex file.
dexOutputFile = j.hiddenAPIEncodeDex(ctx, dexOutputFile, proptools.Bool(j.dexProperties.Uncompress_dex))