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."

Browse Source 
This reverts commit b0dc851ff4.

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
This commit is contained in:
Ulyana Trafimovich
2020-06-04 14:08:17 +00:00
committed by Ulya Trafimovich
parent c55b679e7b
commit 5539e7b568
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

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