diff options
Diffstat (limited to 'java/sdk_library.go')
| -rw-r--r-- | java/sdk_library.go | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/java/sdk_library.go b/java/sdk_library.go index 05a5b4920..07f059928 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -1246,7 +1246,8 @@ type SdkLibrary struct { commonToSdkLibraryAndImport - builtInstalledForApex []dexpreopterInstall + apexSystemServerDexpreoptInstalls []DexpreopterInstall + apexSystemServerDexJars android.Paths } func (module *SdkLibrary) generateTestAndSystemScopesByDefault() bool { @@ -1501,7 +1502,8 @@ func (module *SdkLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) module.dexJarFile = makeDexJarPathFromPath(module.implLibraryInfo.DexJarFile.Path()) module.headerJarFile = module.implLibraryInfo.HeaderJars[0] module.implementationAndResourcesJar = module.implLibraryInfo.ImplementationAndResourcesJars[0] - module.builtInstalledForApex = module.implLibraryInfo.BuiltInstalledForApex + module.apexSystemServerDexpreoptInstalls = module.implLibraryInfo.ApexSystemServerDexpreoptInstalls + module.apexSystemServerDexJars = module.implLibraryInfo.ApexSystemServerDexJars module.dexpreopter.configPath = module.implLibraryInfo.ConfigPath module.dexpreopter.outputProfilePathOnHost = module.implLibraryInfo.OutputProfilePathOnHost @@ -1584,8 +1586,12 @@ func setOutputFilesFromJavaInfo(ctx android.ModuleContext, info *JavaInfo) { ctx.SetOutputFiles(info.GeneratedSrcjars, ".generated_srcjars") } -func (module *SdkLibrary) BuiltInstalledForApex() []dexpreopterInstall { - return module.builtInstalledForApex +func (module *SdkLibrary) ApexSystemServerDexpreoptInstalls() []DexpreopterInstall { + return module.apexSystemServerDexpreoptInstalls +} + +func (module *SdkLibrary) ApexSystemServerDexJars() android.Paths { + return module.apexSystemServerDexJars } func (module *SdkLibrary) AndroidMkEntries() []android.AndroidMkEntries { |