diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2016-03-11 17:01:03 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2016-03-11 17:04:02 -0800 |
| commit | 0f6042e317b1a9ab4bb122167cda5c91cf139026 (patch) | |
| tree | 7cc8eaccd6483ddd5f7ce0f2a0887c207da14d9d | |
| parent | e23dfb7fdccfbc75e3ddc0761e3d12876c06569a (diff) | |
| download | build_soong-0f6042e317b1a9ab4bb122167cda5c91cf139026.tar.gz build_soong-0f6042e317b1a9ab4bb122167cda5c91cf139026.tar.bz2 build_soong-0f6042e317b1a9ab4bb122167cda5c91cf139026.zip | |
Fix optional intermediates path for unbundled builds
On an unbundled build, if an include directory was missing, I generated
an intermediate path with PathForModuleOut. That included another copy
of $OUT_DIR, which I didn't notice. This fails if $OUT_DIR is an
absolute directory. Just manually set up the path for now.
Change-Id: I3821d562c929e69ed2fccb7e88affed384a7789e
| -rw-r--r-- | common/paths.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/paths.go b/common/paths.go index 8d9f6fd4..93cad13c 100644 --- a/common/paths.go +++ b/common/paths.go @@ -176,7 +176,7 @@ func PathsForSource(ctx PathContext, paths []string) Paths { if pathConfig(ctx).AllowMissingDependencies() { if modCtx, ok := ctx.(AndroidModuleContext); ok { ret := make(Paths, 0, len(paths)) - intermediates := PathForModuleOut(modCtx, "missing").String() + intermediates := filepath.Join(modCtx.ModuleDir(), modCtx.ModuleName(), modCtx.ModuleSubDir(), "missing") for _, path := range paths { p := OptionalPathForSource(ctx, intermediates, path) if p.Valid() { |