From 5539e7b568c19dc6d5720f49599f9832cdeee8e1 Mon Sep 17 00:00:00 2001 From: Ulyana Trafimovich Date: Thu, 4 Jun 2020 14:08:17 +0000 Subject: Revert^2 "Rename DexJar interface method to DexJarBuildPath." This reverts commit b0dc851ff4eca650042b52ce4ff06cb7e0312b77. Reason for revert: relanding original change. Build failures were caused by a race with another CL: https://r.android.com/1320920 Test: lunch aosp_cf_x86_phone-userdebug && m Change-Id: Ic9016582dae7773b4d4f84a63425f1ef7a5d061f --- 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 eaf0fe968..368dcc612 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 - DexJar() android.Path + DexJarBuildPath() 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) DexJar() android.Path { +func (j *Module) DexJarBuildPath() android.Path { return j.dexJarFile } @@ -2565,7 +2565,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 } @@ -2752,7 +2752,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 } -- cgit v1.2.3-59-g8ed1b