diff options
| author | 2017-09-20 12:59:05 -0700 | |
|---|---|---|
| committer | 2017-10-03 10:25:15 -0700 | |
| commit | 6af17aa0228ce589914f93d3b48183bb356e52e5 (patch) | |
| tree | 67dff285d69b0b2f484022a601ea4e62833d1462 /java/builder.go | |
| parent | 47ff2521c6479c44c5b7b0874948346b04c682df (diff) | |
Add support for .proto files in java modules
Test: m -j checkbuild
Change-Id: Ia03429948baebff85164a91a34507866c97a08ef
Diffstat (limited to 'java/builder.go')
| -rw-r--r-- | java/builder.go | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/java/builder.go b/java/builder.go index 95345d40f..b924d6540 100644 --- a/java/builder.go +++ b/java/builder.go @@ -127,6 +127,9 @@ type javaBuilderFlags struct { desugarFlags string aidlFlags string javaVersion string + + protoFlags string + protoOutFlag string } func TransformJavaToClasses(ctx android.ModuleContext, srcFiles, srcFileLists android.Paths, @@ -136,7 +139,10 @@ func TransformJavaToClasses(ctx android.ModuleContext, srcFiles, srcFileLists an annoDir := android.PathForModuleOut(ctx, "anno") classJar := android.PathForModuleOut(ctx, "classes-compiled.jar") - javacFlags := flags.javacFlags + android.JoinWithPrefix(srcFileLists.Strings(), "@") + javacFlags := flags.javacFlags + if len(srcFileLists) > 0 { + javacFlags += " " + android.JoinWithPrefix(srcFileLists.Strings(), "@") + } deps = append(deps, srcFileLists...) deps = append(deps, flags.bootClasspath...) @@ -161,8 +167,8 @@ func TransformJavaToClasses(ctx android.ModuleContext, srcFiles, srcFileLists an return classJar } -func RunErrorProne(ctx android.ModuleContext, srcFiles android.Paths, srcFileLists android.Paths, - flags javaBuilderFlags, deps android.Paths) android.Path { +func RunErrorProne(ctx android.ModuleContext, srcFiles, srcFileLists android.Paths, + flags javaBuilderFlags) android.Path { if config.ErrorProneJar == "" { ctx.ModuleErrorf("cannot build with Error Prone, missing external/error_prone?") @@ -173,7 +179,12 @@ func RunErrorProne(ctx android.ModuleContext, srcFiles android.Paths, srcFileLis annoDir := android.PathForModuleOut(ctx, "anno-errorprone") classFileList := android.PathForModuleOut(ctx, "classes-errorprone.list") - javacFlags := flags.javacFlags + android.JoinWithPrefix(srcFileLists.Strings(), "@") + javacFlags := flags.javacFlags + if len(srcFileLists) > 0 { + javacFlags += " " + android.JoinWithPrefix(srcFileLists.Strings(), "@") + } + + var deps android.Paths deps = append(deps, srcFileLists...) deps = append(deps, flags.bootClasspath...) |