Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove uses of depfile in gensrcs modules"

Browse Source
This commit is contained in:
Vinh Tran
2022-06-15 18:03:25 +00:00
committed by Gerrit Code Review
parent 7b1d883876 61e69fabe1
commit 892f6a9314
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ProtoLibraries.bp
View File

@@ -14,7 +14,6 @@
gensrcs { gensrcs {
name: "framework-javastream-protos", name: "framework-javastream-protos",
depfile: true,
tools: [ tools: [
"aprotoc", "aprotoc",
@@ -22,10 +21,13 @@ gensrcs {
"soong_zip", "soong_zip",
], ],
tool_files: [
":libprotobuf-internal-protos",
],
cmd: "mkdir -p $(genDir)/$(in) " + cmd: "mkdir -p $(genDir)/$(in) " +
"&& $(location aprotoc) " + "&& $(location aprotoc) " +
" --plugin=$(location protoc-gen-javastream) " + " --plugin=$(location protoc-gen-javastream) " +
" --dependency_out=$(depfile) " +
" --javastream_out=$(genDir)/$(in) " + " --javastream_out=$(genDir)/$(in) " +
" -Iexternal/protobuf/src " + " -Iexternal/protobuf/src " +
" -I . " + " -I . " +
@@ -47,17 +49,19 @@ gensrcs {
gensrcs { gensrcs {
name: "framework-cppstream-protos", name: "framework-cppstream-protos",
depfile: true,
tools: [ tools: [
"aprotoc", "aprotoc",
"protoc-gen-cppstream", "protoc-gen-cppstream",
], ],
tool_files: [
":libprotobuf-internal-protos",
],
cmd: "mkdir -p $(genDir) " + cmd: "mkdir -p $(genDir) " +
"&& $(location aprotoc) " + "&& $(location aprotoc) " +
" --plugin=$(location protoc-gen-cppstream) " + " --plugin=$(location protoc-gen-cppstream) " +
" --dependency_out=$(depfile) " +
" --cppstream_out=$(genDir) " + " --cppstream_out=$(genDir) " +
" -Iexternal/protobuf/src " + " -Iexternal/protobuf/src " +
" -I . " + " -I . " +