diff options
| author | Ulyana Trafimovich <skvadrik@google.com> | 2020-06-04 10:36:28 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-04 10:36:28 +0000 |
| commit | 0cc337d35ae408430bbaabb1f63b92d7c6bc7e1b (patch) | |
| tree | ab893f2db70f535ab2c08344121f94adfd8b0428 /java/java.go | |
| parent | 317cc83ebba70d43fc95dd1c93dff57f337d6bb0 (diff) | |
| parent | 22cd1b53839688e61a35bef3a85c25efbdbec3f4 (diff) | |
Merge "Rename DexJar interface method to DexJarBuildPath." am: 2a08566634 am: 22cd1b5383
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1322701
Change-Id: I87a6570cc6184bb38dda1f83dac787c30d8aaa54
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/java/java.go b/java/java.go index 67420f223..34cb5091f 100644 --- a/java/java.go +++ b/java/java.go @@ -505,7 +505,7 @@ type Dependency interface { ImplementationJars() android.Paths ResourceJars() android.Paths ImplementationAndResourcesJars() android.Paths - DexJar() android.Path + DexJarBuildPath() android.Path AidlIncludeDirs() android.Paths ExportedSdkLibs() []string ExportedPlugins() (android.Paths, []string) @@ -1748,7 +1748,7 @@ func (j *Module) ImplementationJars() android.Paths { return android.Paths{j.implementationJarFile} } -func (j *Module) DexJar() android.Path { +func (j *Module) DexJarBuildPath() android.Path { return j.dexJarFile } @@ -2574,7 +2574,7 @@ func (j *Import) ImplementationAndResourcesJars() android.Paths { return android.Paths{j.combinedClasspathFile} } -func (j *Import) DexJar() android.Path { +func (j *Import) DexJarBuildPath() android.Path { return nil } @@ -2761,7 +2761,7 @@ func (j *DexImport) GenerateAndroidBuildActions(ctx android.ModuleContext) { j.Stem()+".jar", dexOutputFile) } -func (j *DexImport) DexJar() android.Path { +func (j *DexImport) DexJarBuildPath() android.Path { return j.dexJarFile } |