diff options
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/java/java.go b/java/java.go index 9e158d1c3..cd97ce0e9 100644 --- a/java/java.go +++ b/java/java.go @@ -402,7 +402,12 @@ type JavaInfo struct { BuiltInstalled string - BuiltInstalledForApex []dexpreopterInstall + // ApexSystemServerDexpreoptInstalls stores the list of dexpreopt artifacts if this is a system server + // jar in an apex. + ApexSystemServerDexpreoptInstalls []DexpreopterInstall + + // ApexSystemServerDexJars stores the list of dex jars if this is a system server jar in an apex. + ApexSystemServerDexJars android.Paths // The config is used for two purposes: // - Passing dexpreopt information about libraries from Soong to Make. This is needed when @@ -1129,7 +1134,8 @@ func (j *Library) GenerateAndroidBuildActions(ctx android.ModuleContext) { javaInfo.BootDexJarPath = j.bootDexJarPath javaInfo.UncompressDexState = j.uncompressDexState javaInfo.Active = j.active - javaInfo.BuiltInstalledForApex = j.builtInstalledForApex + javaInfo.ApexSystemServerDexpreoptInstalls = j.apexSystemServerDexpreoptInstalls + javaInfo.ApexSystemServerDexJars = j.apexSystemServerDexJars javaInfo.BuiltInstalled = j.builtInstalled javaInfo.ConfigPath = j.configPath javaInfo.OutputProfilePathOnHost = j.outputProfilePathOnHost @@ -1172,7 +1178,6 @@ func (j *Library) javaLibraryModuleInfoJSON(ctx android.ModuleContext) *android. if j.hideApexVariantFromMake { moduleInfoJSON.Disabled = true - j.dexpreopter.ModuleInfoJSONForApex(ctx) } return moduleInfoJSON } |