diff options
| author | 2021-03-29 20:11:58 +0900 | |
|---|---|---|
| committer | 2021-04-03 08:25:12 +0900 | |
| commit | f1691d2a2c23631c25291bc653d25a8f906b9c5d (patch) | |
| tree | c5b311093dbf48ad5fe0950928c05a7bef2a677e /java/dex.go | |
| parent | 100d5d67328e91d88f11ba8ec7a5a3997d9c5bdc (diff) | |
Move java.sdkSpec to the android package
... in preparation for making the handling of sdk versions consistent
across java and cc modules.
Bug: 175678607
Test: m
Change-Id: I598f0454bce9b7320621022115412fbe97403945
Diffstat (limited to 'java/dex.go')
| -rw-r--r-- | java/dex.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/java/dex.go b/java/dex.go index b042f133f..5c6d41d87 100644 --- a/java/dex.go +++ b/java/dex.go @@ -157,7 +157,7 @@ var r8, r8RE = pctx.MultiCommandRemoteStaticRules("r8", }, []string{"outDir", "outDict", "outUsage", "outUsageZip", "outUsageDir", "r8Flags", "zipFlags"}, []string{"implicits"}) -func (d *dexer) dexCommonFlags(ctx android.ModuleContext, minSdkVersion sdkSpec) []string { +func (d *dexer) dexCommonFlags(ctx android.ModuleContext, minSdkVersion android.SdkSpec) []string { flags := d.dexProperties.Dxflags // Translate all the DX flags to D8 ones until all the build files have been migrated // to D8 flags. See: b/69377755 @@ -174,12 +174,12 @@ func (d *dexer) dexCommonFlags(ctx android.ModuleContext, minSdkVersion sdkSpec) "--verbose") } - effectiveVersion, err := minSdkVersion.effectiveVersion(ctx) + effectiveVersion, err := minSdkVersion.EffectiveVersion(ctx) if err != nil { ctx.PropertyErrorf("min_sdk_version", "%s", err) } - flags = append(flags, "--min-api "+effectiveVersion.asNumberString()) + flags = append(flags, "--min-api "+effectiveVersion.AsNumberString()) return flags } @@ -266,7 +266,7 @@ func (d *dexer) r8Flags(ctx android.ModuleContext, flags javaBuilderFlags) (r8Fl return r8Flags, r8Deps } -func (d *dexer) compileDex(ctx android.ModuleContext, flags javaBuilderFlags, minSdkVersion sdkSpec, +func (d *dexer) compileDex(ctx android.ModuleContext, flags javaBuilderFlags, minSdkVersion android.SdkSpec, classesJar android.Path, jarName string) android.OutputPath { // Compile classes.jar into classes.dex and then javalib.jar |