From 5539e7b568c19dc6d5720f49599f9832cdeee8e1 Mon Sep 17 00:00:00 2001 From: Ulyana Trafimovich Date: Thu, 4 Jun 2020 14:08:17 +0000 Subject: [PATCH] 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 --- apex/apex.go | 4 ++-- java/aar.go | 2 +- java/app.go | 2 +- java/device_host_converter.go | 2 +- java/dexpreopt_bootjars.go | 4 ++-- java/hiddenapi_singleton.go | 2 +- java/java.go | 8 ++++---- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/apex/apex.go b/apex/apex.go index 8fd80fcaf..b9fc4e18e 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -1650,14 +1650,14 @@ func apexFileForShBinary(ctx android.BaseModuleContext, sh *sh.ShBinary) apexFil } type javaDependency interface { - DexJar() android.Path + DexJarBuildPath() android.Path JacocoReportClassesFile() android.Path Stem() string } func apexFileForJavaLibrary(ctx android.BaseModuleContext, lib javaDependency, module android.Module) apexFile { dirInApex := "javalib" - fileToCopy := lib.DexJar() + fileToCopy := lib.DexJarBuildPath() af := newApexFile(ctx, fileToCopy, module.Name(), dirInApex, javaSharedLib, module) af.jacocoReportClassesFile = lib.JacocoReportClassesFile() af.stem = lib.Stem() + ".jar" diff --git a/java/aar.go b/java/aar.go index c8daf835b..7413c8082 100644 --- a/java/aar.go +++ b/java/aar.go @@ -730,7 +730,7 @@ func (a *AARImport) ImplementationAndResourcesJars() android.Paths { return android.Paths{a.classpathFile} } -func (a *AARImport) DexJar() android.Path { +func (a *AARImport) DexJarBuildPath() android.Path { return nil } diff --git a/java/app.go b/java/app.go index a45ab6f99..fb02c998d 100755 --- a/java/app.go +++ b/java/app.go @@ -1882,7 +1882,7 @@ func (u *usesLibrary) usesLibraryPaths(ctx android.ModuleContext) map[string]and if !ctx.Config().UnbundledBuild() { ctx.VisitDirectDepsWithTag(usesLibTag, func(m android.Module) { if lib, ok := m.(Dependency); ok { - if dexJar := lib.DexJar(); dexJar != nil { + if dexJar := lib.DexJarBuildPath(); dexJar != nil { usesLibPaths[ctx.OtherModuleName(m)] = dexJar } else { ctx.ModuleErrorf("module %q in uses_libs or optional_uses_libs must produce a dex jar, does it have installable: true?", diff --git a/java/device_host_converter.go b/java/device_host_converter.go index b40ab9316..1ffb13f94 100644 --- a/java/device_host_converter.go +++ b/java/device_host_converter.go @@ -150,7 +150,7 @@ func (d *DeviceHostConverter) ImplementationAndResourcesJars() android.Paths { return d.implementationAndResourceJars } -func (d *DeviceHostConverter) DexJar() android.Path { +func (d *DeviceHostConverter) DexJarBuildPath() android.Path { return nil } diff --git a/java/dexpreopt_bootjars.go b/java/dexpreopt_bootjars.go index ed61d4bd3..9d9383814 100644 --- a/java/dexpreopt_bootjars.go +++ b/java/dexpreopt_bootjars.go @@ -255,7 +255,7 @@ func getBootImageJar(ctx android.SingletonContext, image *bootImageConfig, modul return -1, nil } - jar, hasJar := module.(interface{ DexJar() android.Path }) + jar, hasJar := module.(interface{ DexJarBuildPath() android.Path }) if !hasJar { return -1, nil } @@ -296,7 +296,7 @@ func getBootImageJar(ctx android.SingletonContext, image *bootImageConfig, modul panic("unknown boot image: " + image.name) } - return index, jar.DexJar() + return index, jar.DexJarBuildPath() } // buildBootImage takes a bootImageConfig, creates rules to build it, and returns the image. diff --git a/java/hiddenapi_singleton.go b/java/hiddenapi_singleton.go index c7f7cbdfe..2f35798b5 100644 --- a/java/hiddenapi_singleton.go +++ b/java/hiddenapi_singleton.go @@ -147,7 +147,7 @@ func stubFlagsRule(ctx android.SingletonContext) { name := ctx.ModuleName(module) for moduleList, pathList := range moduleListToPathList { if i := android.IndexList(name, *moduleList); i != -1 { - pathList[i] = j.DexJar() + pathList[i] = j.DexJarBuildPath() } } } 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 }