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

Revert^2 "Rename DexJar interface method to DexJarBuildPath." am: 5539e7b568 am: 0852ac9a6d

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

Change-Id: I75dc93bb6aac621a0d90e5c5051cdeab98f5d1ef
This commit is contained in:
Ulyana Trafimovich
2020-06-05 01:29:34 +00:00
committed by Automerger Merge Worker
parent 9985c8cdb2 0852ac9a6d
commit abbe8875b3
7 changed files with 12 additions and 12 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
DexJar() android.Path
DexJarBuildPath() 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) DexJar() android.Path {
func (j *Module) DexJarBuildPath() android.Path {
return j.dexJarFile
}
@@ -2574,7 +2574,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
}
@@ -2761,7 +2761,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
}