diff options
| author | Colin Cross <ccross@android.com> | 2018-12-21 12:59:54 -0800 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2019-01-09 08:31:48 +0000 |
| commit | 2fc72f66d06ecaa08b35a206db7fd8f0f2de5c39 (patch) | |
| tree | 305196740739ffafb6134831d782a8cd3715be3e /java/dexpreopt.go | |
| parent | 1f8076b42dfd99d01b720c027bafd7f671b1d12a (diff) | |
| download | android_build_soong-2fc72f66d06ecaa08b35a206db7fd8f0f2de5c39.tar.gz android_build_soong-2fc72f66d06ecaa08b35a206db7fd8f0f2de5c39.tar.bz2 android_build_soong-2fc72f66d06ecaa08b35a206db7fd8f0f2de5c39.zip | |
Remove duplicated shouldUncompressDex logic
shouldUncompressDex has already been computed and stored in
deviceProperties.UncompressDex, pass it to dexpreopter instead
of recomputing it.
Also add a stub for java libraries to set UncompressDex.
Test: no change to build.ninja
Change-Id: I663d9fbbe768a8dc9a97c7d456dd7a010f43162d
Diffstat (limited to 'java/dexpreopt.go')
| -rw-r--r-- | java/dexpreopt.go | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/java/dexpreopt.go b/java/dexpreopt.go index 1dc3e9fd..ce51abaa 100644 --- a/java/dexpreopt.go +++ b/java/dexpreopt.go @@ -28,11 +28,11 @@ import ( type dexpreopter struct { dexpreoptProperties DexpreoptProperties - installPath android.OutputPath - isPrivApp bool - isSDKLibrary bool - isTest bool - isInstallable bool + installPath android.OutputPath + uncompressedDex bool + isSDKLibrary bool + isTest bool + isInstallable bool builtInstalled []string } @@ -145,19 +145,13 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Mo deps = append(deps, profileClassListing.Path()) } - uncompressedDex := false - if ctx.Config().UncompressPrivAppDex() && - (d.isPrivApp || inList(ctx.ModuleName(), ctx.Config().ModulesLoadedByPrivilegedModules())) { - uncompressedDex = true - } - dexpreoptConfig := dexpreopt.ModuleConfig{ Name: ctx.ModuleName(), DexLocation: dexLocation, BuildPath: android.PathForModuleOut(ctx, "dexpreopt", ctx.ModuleName()+".jar").String(), DexPath: dexJarFile.String(), PreferCodeIntegrity: false, - UncompressedDex: uncompressedDex, + UncompressedDex: d.uncompressedDex, HasApkLibraries: false, PreoptFlags: nil, |