From 2934d29a697cb0bc29f54045d0d7ad1d0b3fde19 Mon Sep 17 00:00:00 2001
From: Liz Kammer <eakammer@google.com>
Date: Fri, 9 Jun 2023 14:04:26 -0400
Subject: [PATCH] Use new data property to sandbox stream protos
Test: build stream proto targets with sandboxing enabled
Change-Id: I025b501dd32969609550c49bd54254aa7cd391df
---
ProtoLibraries.bp | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/ProtoLibraries.bp b/ProtoLibraries.bp
index a0944d40a5e35..18c562bc9b112 100644
--- a/ProtoLibraries.bp
+++ b/ProtoLibraries.bp
@@ -21,10 +21,6 @@ gensrcs {
"soong_zip",
],
- tool_files: [
- ":libprotobuf-internal-protos",
- ],
-
cmd: "mkdir -p $(genDir)/$(in) " +
"&& $(location aprotoc) " +
" --plugin=$(location protoc-gen-javastream) " +
@@ -43,6 +39,11 @@ gensrcs {
"libs/incident/**/*.proto",
":service-permission-streaming-proto-sources",
],
+
+ data: [
+ ":libprotobuf-internal-protos",
+ ],
+
output_extension: "srcjar",
}
@@ -54,10 +55,6 @@ gensrcs {
"protoc-gen-cppstream",
],
- tool_files: [
- ":libprotobuf-internal-protos",
- ],
-
cmd: "mkdir -p $(genDir) " +
"&& $(location aprotoc) " +
" --plugin=$(location protoc-gen-cppstream) " +
@@ -75,6 +72,10 @@ gensrcs {
":service-permission-streaming-proto-sources",
],
+ data: [
+ ":libprotobuf-internal-protos",
+ ],
+
output_extension: "proto.h",
}
--
GitLab