From b0dc851ff4eca650042b52ce4ff06cb7e0312b77 Mon Sep 17 00:00:00 2001 From: Ulyana Trafimovich Date: Thu, 4 Jun 2020 10:37:36 +0000 Subject: Revert "Rename DexJar interface method to DexJarBuildPath." This reverts commit 562c240185dd4adcbdb75d2924c69657f6ac7cff. Reason for revert: breaks `lunch full-eng && m checkbuild`. Change-Id: Id7c7d6240d98afaf8edd49b6c96cd05534b784cc --- java/java.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'java/java.go') diff --git a/java/java.go b/java/java.go index 778fe316e..09df2ad43 100644 --- a/java/java.go +++ b/java/java.go @@ -498,7 +498,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) @@ -1736,7 +1736,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 } @@ -2562,7 +2562,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 } @@ -2745,7 +2745,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 } -- cgit v1.2.3-59-g8ed1b