Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2d77d4a authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Use soong_zip -srcjar for proto and aidl srcjars"

parents 7dbc5786 cf02ec87

java/gen.go

+1 −4
Original line number Diff line number Diff line
@@ -78,10 +78,7 @@ func genAidl(ctx android.ModuleContext, aidlFiles android.Paths, aidlFlags strin 


		rule.Command().

			Tool(ctx.Config().HostToolPath(ctx, "soong_zip")).

			// TODO(b/124333557): this can't use -srcjar for now, aidl on parcelables generates java files

			//  without a package statement, which causes -srcjar to put them in the top level of the zip file.

			//  Once aidl skips parcelables we can use -srcjar.

			//Flag("-srcjar").

			Flag("-srcjar").

			Flag("-write_if_changed").

			FlagWithOutput("-o ", srcJarFile).

			FlagWithArg("-C ", outDir.String()).

java/proto.go

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ func genProto(ctx android.ModuleContext, protoFiles android.Paths, flags android 
		// into a srcjar.

		rule.Command().

			BuiltTool("soong_zip").

			Flag("-jar").

			Flag("-srcjar").

			Flag("-write_if_changed").

			FlagWithOutput("-o ", srcJarFile).

			FlagWithArg("-C ", outDir.String()).