From e243c231da6fca6c40f8075bf014094f4ec0fce0 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Sat, 21 Oct 2017 15:16:37 -0700 Subject: [PATCH] Fix finding src directory for aidl aidlFlags was always looking for a src directory at the top level instead of in the module's source directory. Test: m checkbuild Change-Id: Ie31baa21c8632c2bd9a6ebc42e6291417b1f31cd --- java/java.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/java.go b/java/java.go index fbd7bdd8b..8941b4d7f 100644 --- a/java/java.go +++ b/java/java.go @@ -374,7 +374,7 @@ 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()) - if src := android.ExistentPathForSource(ctx, "", "src"); src.Valid() { + if src := android.ExistentPathForSource(ctx, "", ctx.ModuleDir(), "src"); src.Valid() { flags = append(flags, "-I"+src.String()) }