commit 4f3aaab6848b0bf8fcdcc8c814a757d1f12e43f2
author Dmitri Plotnikov <dplotnikov@google.com> Wed Jun 15 22:36:57 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 15 22:36:57 2022 +0000
tree cad31631bb4f27d17baa3b162e796910cda18b94
parent 892f6a931469a14348b18366fa0eb04c1d1fb7d9
parent 79fb181524114b26ac2a935f01f9b8b1431e6cc4

Merge "Add OWNERS file to services/core/java/com/android/server/power/stats"

ProtoLibraries.bp

diff --git a/ProtoLibraries.bp b/ProtoLibraries.bp
index d18154a..de84792 100644
--- a/ProtoLibraries.bp
+++ b/ProtoLibraries.bp
@@ -14,7 +14,6 @@
 
 gensrcs {
     name: "framework-javastream-protos",
-    depfile: true,
 
     tools: [
         "aprotoc",
@@ -22,10 +21,13 @@
         "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 {
     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 . " +