From 0f6042e317b1a9ab4bb122167cda5c91cf139026 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Fri, 11 Mar 2016 17:01:03 -0800 Subject: [PATCH] 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 --- common/paths.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/paths.go b/common/paths.go index 8d9f6fd44..93cad13c7 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() {