diff options
| author | Ulyana Trafimovich <skvadrik@google.com> | 2020-06-04 11:02:49 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-04 11:02:49 +0000 |
| commit | 651a63ca9d9ad02bb12a6770cae82e1cb36a40bb (patch) | |
| tree | 1b39d6cec3e76e6201d0059eae28919516d6b3b8 /java/java.go | |
| parent | 22cd1b53839688e61a35bef3a85c25efbdbec3f4 (diff) | |
| parent | c55b679e7bbd2bd64c39464f030fc9b427ec7363 (diff) | |
Merge "Revert "Rename DexJar interface method to DexJarBuildPath."" am: c55b679e7b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1324371
Change-Id: Ia2202f5363faa713d6ad21e529f66c25d40029c9
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 368dcc612..eaf0fe968 100644 --- a/java/java.go +++ b/java/java.go @@ -501,7 +501,7 @@ type Dependency interface { ImplementationJars() android.Paths ResourceJars() android.Paths ImplementationAndResourcesJars() android.Paths - DexJarBuildPath() android.Path + DexJar() android.Path AidlIncludeDirs() android.Paths ExportedSdkLibs() []string ExportedPlugins() (android.Paths, []string) @@ -1739,7 +1739,7 @@ func (j *Module) ImplementationJars() android.Paths { return android.Paths{j.implementationJarFile} } -func (j *Module) DexJarBuildPath() android.Path { +func (j *Module) DexJar() android.Path { return j.dexJarFile } @@ -2565,7 +2565,7 @@ func (j *Import) ImplementationAndResourcesJars() android.Paths { return android.Paths{j.combinedClasspathFile} } -func (j *Import) DexJarBuildPath() android.Path { +func (j *Import) DexJar() android.Path { return nil } @@ -2752,7 +2752,7 @@ func (j *DexImport) GenerateAndroidBuildActions(ctx android.ModuleContext) { j.Stem()+".jar", dexOutputFile) } -func (j *DexImport) DexJarBuildPath() android.Path { +func (j *DexImport) DexJar() android.Path { return j.dexJarFile } |