Merge "Rename DexJar interface method to DexJarBuildPath." am: 2a08566634
am: 22cd1b5383
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1322701 Change-Id: I87a6570cc6184bb38dda1f83dac787c30d8aaa54
This commit is contained in:
committed by
Automerger Merge Worker
commit
0cc337d35a
@@ -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
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user