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." am: 69bd288409 am: 73759b9a5d

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

Change-Id: Iec7143aa2f61c9d5b7b61e8d9510db3a573d794a
This commit is contained in:
Ulyana Trafimovich
2020-06-11 14:23:22 +00:00
committed by Automerger Merge Worker
parent edb865e119 73759b9a5d
commit 12a10b050f
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

@@ -506,6 +506,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)
@@ -1753,6 +1754,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
@@ -2579,6 +2584,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
}