From d48633a564a24c22371ff5174c5cd646dda56b81 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 13 Jul 2017 14:41:17 -0700 Subject: [PATCH] Use ExistentPathForSource Converting java to use Path objects incorrectly used PathForModuleSrc for a path that might not exist, use ExistentPathForSource instead. Test: java_test.go Change-Id: I50e4e315a10ab08c4e72065094ae29844874f5e4 --- java/java.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/java/java.go b/java/java.go index 3cc552f0a..adb3d7bdb 100644 --- a/java/java.go +++ b/java/java.go @@ -203,7 +203,9 @@ func (j *Module) aidlFlags(ctx android.ModuleContext, aidlPreprocess android.Opt flags = append(flags, android.JoinWithPrefix(j.exportAidlIncludeDirs.Strings(), "-I")) flags = append(flags, android.JoinWithPrefix(localAidlIncludes.Strings(), "-I")) flags = append(flags, "-I"+android.PathForModuleSrc(ctx).String()) - flags = append(flags, "-I"+android.PathForModuleSrc(ctx, "src").String()) + if src := android.ExistentPathForSource(ctx, "", "src"); src.Valid() { + flags = append(flags, "-I"+src.String()) + } return flags }