diff options
| author | Ulyana Trafimovich <skvadrik@google.com> | 2020-06-04 11:13:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-04 11:13:23 +0000 |
| commit | 7e59e8e2dfa38b2ce996cb13da6c9c24cb00c61b (patch) | |
| tree | e24fb3f2b509404d492ef72aab62831d6a76c422 /java/java.go | |
| parent | 0cc337d35ae408430bbaabb1f63b92d7c6bc7e1b (diff) | |
| parent | 651a63ca9d9ad02bb12a6770cae82e1cb36a40bb (diff) | |
Merge "Revert "Rename DexJar interface method to DexJarBuildPath."" am: c55b679e7b am: 651a63ca9d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1324371
Change-Id: Ic3be6718aff2b04048bac17635b2858581fe7f8a
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 34cb5091f..67420f223 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 - DexJarBuildPath() android.Path + DexJar() 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) DexJarBuildPath() android.Path { +func (j *Module) DexJar() android.Path { return j.dexJarFile } @@ -2574,7 +2574,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 } @@ -2761,7 +2761,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 } |