diff options
| author | Ulyana Trafimovich <skvadrik@google.com> | 2020-06-11 14:23:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-11 14:23:22 +0000 |
| commit | 12a10b050f41ccfb93f85bc8162575b05b75d0ec (patch) | |
| tree | 91440eb37b06701bed3af04a046e4bb779135ca8 /java/java.go | |
| parent | edb865e11994ecbe11b2caf03d00782d1347c594 (diff) | |
| parent | 73759b9a5d3c4381d2346dfc0ea832d0e2b77fd8 (diff) | |
Merge "Fix on-device paths to used libraries in dexpreopt." am: 69bd288409 am: 73759b9a5d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1326319
Change-Id: Iec7143aa2f61c9d5b7b61e8d9510db3a573d794a
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 9a14ee81a..4156bbbab 100644 --- a/java/java.go +++ b/java/java.go @@ -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 } |