diff options
| author | Ulyana Trafimovich <skvadrik@google.com> | 2020-06-11 13:57:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-11 13:57:52 +0000 |
| commit | 73759b9a5d3c4381d2346dfc0ea832d0e2b77fd8 (patch) | |
| tree | 31a868e59f1430bf60f301c731be68d0f1d273eb /java/java.go | |
| parent | 46560dfdf391d009a23e761c68b875193a28cc63 (diff) | |
| parent | 69bd288409194e275f5c585a4d80e1ab923fe5e8 (diff) | |
Merge "Fix on-device paths to used libraries in dexpreopt." am: 69bd288409
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1326319
Change-Id: I0ae80438d2e6971173d66c4ab718cd3f8a6a47c1
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/java/java.go b/java/java.go index 226e0b91b..5f8ad034d 100644 --- a/java/java.go +++ b/java/java.go @@ -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 } |