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
This commit is contained in:
Dan Willemsen 2016-03-11 17:01:03 -08:00
parent e23dfb7fdc
commit 0f6042e317
1 changed files with 1 additions and 1 deletions

View File

@ -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() {