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

Merge "Fix on-device paths to used libraries in dexpreopt."

Browse Source
This commit is contained in:
Ulyana Trafimovich
2020-06-11 13:47:19 +00:00
committed by Gerrit Code Review
parent 5cdb051ce3 9f3052cd78
commit 69bd288409
4 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
java/java.go
View File

@@ -502,6 +502,7 @@ type Dependency interface {
ResourceJars() android.Paths
ImplementationAndResourcesJars() android.Paths
DexJarBuildPath() android.Path
DexJarInstallPath() android.Path
AidlIncludeDirs() android.Paths
ExportedSdkLibs() []string
ExportedPlugins() (android.Paths, []string)
@@ -1749,6 +1750,10 @@ func (j *Module) DexJarBuildPath() android.Path {
return j.dexJarFile
}
func (j *Module) DexJarInstallPath() android.Path {
return j.installFile
}
func (j *Module) ResourceJars() android.Paths {
if j.resourceJar == nil {
return nil
@@ -2575,6 +2580,10 @@ func (j *Import) DexJarBuildPath() android.Path {
return nil
}
func (j *Import) DexJarInstallPath() android.Path {
return nil
}
func (j *Import) AidlIncludeDirs() android.Paths {
return j.exportAidlIncludeDirs
}