diff options
| author | 2019-10-01 22:05:35 -0700 | |
|---|---|---|
| committer | 2019-10-03 10:07:53 -0700 | |
| commit | 70dda7e3da7eed09c1c7e0a3ab8b2ed3c9934035 (patch) | |
| tree | bf5617ddbc63bf321eb134399893f8844ccf95ef /java/java.go | |
| parent | 90ba5f4e98a29c5ed3e6c1c9bb39118b9454e97b (diff) | |
Separate InstallPath from OutputPath
Create a new type InstallPath that is similar to OutputPath to
differentiate intermediates output paths from installed output
paths.
RelPathString is a poorly defined, undocumented function that is
primarily used to get an install path relative to out/soong to
generate an equivalent install path for Make relative to $(OUT_DIR).
Move it to InstallPath for now, and fix the one remaining user on
OutputPath.
Add a method to create an NDK install path so that ndk_sysroot.go
doesn't have to do it manually with PathForOutput.
Bug: 141877526
Test: m checkbuild
Change-Id: I83c5a0bd1fd6c3dba8d3b6d20d039f64f353ddd5
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 2 |
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 { |