diff options
| author | 2020-10-08 12:53:58 +0100 | |
|---|---|---|
| committer | 2020-11-16 14:59:07 +0000 | |
| commit | b23d28c6e25aeeefa52f6d2569970be2a6de222c (patch) | |
| tree | f506dcc183bde40758e4b2cd7f532802370d04b3 /java/app.go | |
| parent | a8c28e27bc60e7f595def374edd2c7b1e1516b77 (diff) | |
Rename fields and methods to reflect class loader context changes.
Test: lunch aosp_cf_x86_phone-userdebug && m
Bug: 132357300
Change-Id: Iebfbf2ffdac5ee48476d2aac312b3b8f4471fc85
Diffstat (limited to 'java/app.go')
| -rwxr-xr-x | java/app.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/java/app.go b/java/app.go index d8c33af0e..17de8b9a5 100755 --- a/java/app.go +++ b/java/app.go @@ -566,7 +566,7 @@ func (a *AndroidApp) aaptBuildActions(ctx android.ModuleContext) { a.aapt.splitNames = a.appProperties.Package_splits a.aapt.LoggingParent = String(a.overridableAppProperties.Logging_parent) - a.aapt.buildActions(ctx, sdkContext(a), a.exportedSdkLibs, aaptLinkFlags...) + a.aapt.buildActions(ctx, sdkContext(a), a.classLoaderContexts, aaptLinkFlags...) // apps manifests are handled by aapt, don't let Module see them a.properties.Manifest = nil @@ -608,7 +608,7 @@ func (a *AndroidApp) dexBuildActions(ctx android.ModuleContext) android.Path { } a.dexpreopter.uncompressedDex = *a.dexProperties.Uncompress_dex a.dexpreopter.enforceUsesLibs = a.usesLibrary.enforceUsesLibraries() - a.dexpreopter.classLoaderContexts = a.exportedSdkLibs + a.dexpreopter.classLoaderContexts = a.classLoaderContexts a.dexpreopter.manifestFile = a.mergedManifestFile if ctx.ModuleName() != "framework-res" { @@ -779,7 +779,7 @@ func (a *AndroidApp) generateAndroidBuildActions(ctx android.ModuleContext) { a.aapt.noticeFile = a.noticeOutputs.HtmlGzOutput } - a.exportedSdkLibs = a.usesLibrary.classLoaderContextForUsesLibDeps(ctx) + a.classLoaderContexts = a.usesLibrary.classLoaderContextForUsesLibDeps(ctx) // Process all building blocks, from AAPT to certificates. a.aaptBuildActions(ctx) @@ -788,7 +788,7 @@ func (a *AndroidApp) generateAndroidBuildActions(ctx android.ModuleContext) { a.usesLibrary.freezeEnforceUsesLibraries() // Add implicit SDK libraries to <uses-library> list. - for _, usesLib := range a.exportedSdkLibs.UsesLibs() { + for _, usesLib := range a.classLoaderContexts.UsesLibs() { a.usesLibrary.addLib(usesLib, inList(usesLib, dexpreopt.OptionalCompatUsesLibs)) } @@ -1982,7 +1982,7 @@ func (u *usesLibrary) classLoaderContextForUsesLibDeps(ctx android.ModuleContext dep := ctx.OtherModuleName(m) if lib, ok := m.(Dependency); ok { clcMap.AddContextForSdk(ctx, tag.sdkVersion, dep, isSharedSdkLibrary(m), - lib.DexJarBuildPath(), lib.DexJarInstallPath(), lib.ExportedSdkLibs()) + lib.DexJarBuildPath(), lib.DexJarInstallPath(), lib.ClassLoaderContexts()) } else if ctx.Config().AllowMissingDependencies() { ctx.AddMissingDependencies([]string{dep}) } else { |