Merge "Remove uses of depfile in gensrcs modules" (892f6a93) · Commits · e / os / android_frameworks_base

ProtoLibraries.bp

+8 −4

Original line number	Diff line number	Diff line
		@@ -14,7 +14,6 @@

		gensrcs {
		name: "framework-javastream-protos",
		depfile: true,

		tools: [
		"aprotoc",
		@@ -22,10 +21,13 @@ gensrcs {
		"soong_zip",
		],

		tool_files: [
		":libprotobuf-internal-protos",
		],

		cmd: "mkdir -p $(genDir)/$(in) " +
		"&& $(location aprotoc) " +
		" --plugin=$(location protoc-gen-javastream) " +
		" --dependency_out=$(depfile) " +
		" --javastream_out=$(genDir)/$(in) " +
		" -Iexternal/protobuf/src " +
		" -I . " +
		@@ -47,17 +49,19 @@ gensrcs {

		gensrcs {
		name: "framework-cppstream-protos",
		depfile: true,

		tools: [
		"aprotoc",
		"protoc-gen-cppstream",
		],

		tool_files: [
		":libprotobuf-internal-protos",
		],

		cmd: "mkdir -p $(genDir) " +
		"&& $(location aprotoc) " +
		" --plugin=$(location protoc-gen-cppstream) " +
		" --dependency_out=$(depfile) " +
		" --cppstream_out=$(genDir) " +
		" -Iexternal/protobuf/src " +
		" -I . " +