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

Merge "Revert "Rename DexJar interface method to DexJarBuildPath."" am: c55b679e7b am: 651a63ca9d

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1324371

Change-Id: Ic3be6718aff2b04048bac17635b2858581fe7f8a
This commit is contained in:
Ulyana Trafimovich
2020-06-04 11:13:23 +00:00
committed by Automerger Merge Worker
parent 0cc337d35a 651a63ca9d
commit 7e59e8e2df
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

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