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

Merge "Use new data property to sandbox stream protos" am: c11454b4ba am: 2e52714bfb am: b499bfd19c

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2617315

Change-Id: Ibed3e34ea88a3793c781adb3a2d66d51df641e4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yu Liu
2023-06-10 05:56:12 +00:00
committed by Automerger Merge Worker
parent b7870229a4 b499bfd19c
commit baae3a9d7b
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ProtoLibraries.bp
View File

@@ -21,10 +21,6 @@ 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) " +
@@ -42,6 +38,11 @@ gensrcs {
"core/proto/**/*.proto", "core/proto/**/*.proto",
"libs/incident/**/*.proto", "libs/incident/**/*.proto",
], ],
data: [
":libprotobuf-internal-protos",
],
output_extension: "srcjar", output_extension: "srcjar",
} }
@@ -53,10 +54,6 @@ gensrcs {
"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) " +
@@ -73,6 +70,10 @@ gensrcs {
"libs/incident/**/*.proto", "libs/incident/**/*.proto",
], ],
data: [
":libprotobuf-internal-protos",
],
output_extension: "proto.h", output_extension: "proto.h",
} }