summaryrefslogtreecommitdiff
path: root/java/java.go
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2019-10-03 21:50:57 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2019-10-03 21:50:57 +0000
commit4acb77e76a3b38f429089b651c4a177d0029205d (patch)
treeda8db546cf3efbb3672d25da99207828720885a6 /java/java.go
parent5ffade1efbff770215d055cc36932f088e0a4d99 (diff)
parentff6c33d885c8a8132728853a8bd2cfd73988b660 (diff)
Merge changes from topic "install"
* changes: Replace RelPathString() with ToMakePath() Separate InstallPath from OutputPath Add InstallInRoot to allow modules to install into root partition
Diffstat (limited to 'java/java.go')
-rw-r--r--java/java.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/java.go b/java/java.go
index f7b0f53ba..4264ba908 100644
--- a/java/java.go
+++ b/java/java.go
@@ -1795,7 +1795,7 @@ type Binary struct {
isWrapperVariant bool
wrapperFile android.Path
- binaryFile android.OutputPath
+ binaryFile android.InstallPath
}
func (j *Binary) HostToolPath() android.OptionalPath {