diff options
| author | 2021-09-15 14:11:07 +0000 | |
|---|---|---|
| committer | 2021-09-15 14:11:07 +0000 | |
| commit | 92346c483249726164f4bd140413d60391121763 (patch) | |
| tree | dbfcb43369c2e014c83676633aa4da9b6c8fb212 /java/java.go | |
| parent | ca9bc98e0cfe9a519cfdd13450a68f1ed7ad5b02 (diff) | |
Revert "Preopt APEX system server jars."
This reverts commit ca9bc98e0cfe9a519cfdd13450a68f1ed7ad5b02.
Reason for revert: breaks build
Bug: 200024131
Change-Id: Ide07b4c4d267370ae31107b1598b2f878c701282
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/java/java.go b/java/java.go index e2665ef04..1a052b432 100644 --- a/java/java.go +++ b/java/java.go @@ -487,7 +487,7 @@ func shouldUncompressDex(ctx android.ModuleContext, dexpreopter *dexpreopter) bo } // Store uncompressed dex files that are preopted on /system. - if !dexpreopter.dexpreoptDisabled(ctx) && (ctx.Host() || !dexpreopter.odexOnSystemOther(ctx, dexpreopter.installPath)) { + if !dexpreopter.dexpreoptDisabled(ctx) && (ctx.Host() || !odexOnSystemOther(ctx, dexpreopter.installPath)) { return true } if ctx.Config().UncompressPrivAppDex() && @@ -508,8 +508,7 @@ func (j *Library) GenerateAndroidBuildActions(ctx android.ModuleContext) { } j.checkSdkVersions(ctx) - j.dexpreopter.installPath = j.dexpreopter.getInstallPath( - ctx, android.PathForModuleInstall(ctx, "framework", j.Stem()+".jar")) + j.dexpreopter.installPath = android.PathForModuleInstall(ctx, "framework", j.Stem()+".jar") j.dexpreopter.isSDKLibrary = j.deviceProperties.IsSDKLibrary if j.dexProperties.Uncompress_dex == nil { // If the value was not force-set by the user, use reasonable default based on the module. @@ -1369,8 +1368,7 @@ func (j *Import) GenerateAndroidBuildActions(ctx android.ModuleContext) { // Dex compilation - j.dexpreopter.installPath = j.dexpreopter.getInstallPath( - ctx, android.PathForModuleInstall(ctx, "framework", jarName)) + j.dexpreopter.installPath = android.PathForModuleInstall(ctx, "framework", jarName) if j.dexProperties.Uncompress_dex == nil { // If the value was not force-set by the user, use reasonable default based on the module. j.dexProperties.Uncompress_dex = proptools.BoolPtr(shouldUncompressDex(ctx, &j.dexpreopter)) @@ -1511,7 +1509,7 @@ func (j *Import) IsInstallable() bool { return Bool(j.properties.Installable) } -var _ DexpreopterInterface = (*Import)(nil) +var _ dexpreopterInterface = (*Import)(nil) // java_import imports one or more `.jar` files into the build graph as if they were built by a java_library module. // @@ -1624,8 +1622,7 @@ func (j *DexImport) GenerateAndroidBuildActions(ctx android.ModuleContext) { j.hideApexVariantFromMake = true } - j.dexpreopter.installPath = j.dexpreopter.getInstallPath( - ctx, android.PathForModuleInstall(ctx, "framework", j.Stem()+".jar")) + j.dexpreopter.installPath = android.PathForModuleInstall(ctx, "framework", j.Stem()+".jar") j.dexpreopter.uncompressedDex = shouldUncompressDex(ctx, &j.dexpreopter) inputJar := ctx.ExpandSource(j.properties.Jars[0], "jars") |