StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Rename DexJar interface method to DexJarBuildPath."

Browse Source 
This reverts commit 562c240185.

Reason for revert: breaks `lunch full-eng && m checkbuild`.

Change-Id: Id7c7d6240d98afaf8edd49b6c96cd05534b784cc
This commit is contained in:
Ulyana Trafimovich
2020-06-04 10:37:36 +00:00
parent 562c240185
commit b0dc851ff4
7 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
java/java.go
View File

@@ -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
}