diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/builder.go | 2 | ||||
| -rw-r--r-- | java/java.go | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/java/builder.go b/java/builder.go index 041c30398..ed9d82c24 100644 --- a/java/builder.go +++ b/java/builder.go @@ -40,7 +40,7 @@ var ( javac = pctx.AndroidGomaStaticRule("javac", blueprint.RuleParams{ Command: `rm -rf "$outDir" && mkdir -p "$outDir" && ` + - `${config.JavacWrapper}$javacCmd ` + + `${JavacWrapper}$javacCmd ` + `-encoding UTF-8 $javacFlags $bootClasspath $classpath ` + `-extdirs "" -d $outDir @$out.rsp || ( rm -rf "$outDir"; exit 41 ) && ` + `find $outDir -name "*.class" > $out`, 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 } |