Sandbox nos genrules am: dd90c28669 am: b7becf5397 am: 00ffa2dea2

Original change: https://android-review.googlesource.com/c/platform/external/nos/host/generic/+/2817933

Change-Id: Ifaac2ed82444f3a506f6717797f94f71aec4027a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

7 files changed, 92 insertions, 16 deletions

diff --git a/libnos/generator/test/Android.bp b/libnos/generator/test/Android.bp
index 30287aa..e0c4d32 100644
--- a/libnos/generator/test/Android.bp
+++ b/libnos/generator/test/Android.bp
@@ -26,7 +26,11 @@ package {
 genrule {
     name: "nos_generator_test_service_genc++",
     out: ["Hello.client.cpp"],
-    srcs: ["nos/generator/test/test.proto"],
+    srcs: [
+        "nos/generator/test/test.proto",
+        ":nugget_options_proto",
+        ":libprotobuf-internal-protos",
+    ],
     tools: ["aprotoc", "protoc-gen-nos-client-cpp"],
     cmd: GEN_SERVICE_SOURCE + "-Iexternal/nos/host/generic/libnos/generator/test",
 }
@@ -34,7 +38,11 @@ genrule {
 genrule {
     name: "nos_generator_test_service_genc++_headers",
     out: ["Hello.client.h"],
-    srcs: ["nos/generator/test/test.proto"],
+    srcs: [
+        "nos/generator/test/test.proto",
+        ":nugget_options_proto",
+        ":libprotobuf-internal-protos",
+    ],
     tools: ["aprotoc", "protoc-gen-nos-client-cpp"],
     cmd: GEN_SERVICE_HEADER + "-Iexternal/nos/host/generic/libnos/generator/test",
 }
@@ -42,7 +50,11 @@ genrule {
 genrule {
     name: "nos_generator_test_service_genc++_mock",
     out: ["MockHello.client.h"],
-    srcs: ["nos/generator/test/test.proto"],
+    srcs: [
+        "nos/generator/test/test.proto",
+        ":nugget_options_proto",
+        ":libprotobuf-internal-protos",
+    ],
     tools: ["aprotoc", "protoc-gen-nos-client-cpp"],
     cmd: GEN_SERVICE_MOCK + "-Iexternal/nos/host/generic/libnos/generator/test",
 }
diff --git a/nugget/proto/Android.bp b/nugget/proto/Android.bp
index b9f1220..b4ee2a0 100644
--- a/nugget/proto/Android.bp
+++ b/nugget/proto/Android.bp
@@ -43,3 +43,8 @@ cc_library {
     },
 
 }
+
+filegroup {
+    name: "nugget_options_proto",
+    srcs:  ["nugget/protobuf/options.proto"],
+}
\ No newline at end of file
diff --git a/nugget/proto/nugget/app/avb/Android.bp b/nugget/proto/nugget/app/avb/Android.bp
index 136b9d5..53b284a 100644
--- a/nugget/proto/nugget/app/avb/Android.bp
+++ b/nugget/proto/nugget/app/avb/Android.bp
@@ -26,7 +26,11 @@ package {
 genrule {
     name: "nos_app_avb_service_genc++",
     out: ["Avb.client.cpp"],
-    srcs: ["avb.proto"],
+    srcs: [
+        "avb.proto",
+        ":nugget_options_proto",
+        ":libprotobuf-internal-protos",
+    ],
     tools: ["aprotoc", "protoc-gen-nos-client-cpp"],
     cmd: GEN_SERVICE_SOURCE,
 }
@@ -34,7 +38,11 @@ genrule {
 genrule {
     name: "nos_app_avb_service_genc++_headers",
     out: ["Avb.client.h"],
-    srcs: ["avb.proto"],
+    srcs: [
+        "avb.proto",
+        ":nugget_options_proto",
+        ":libprotobuf-internal-protos",
+    ],
     tools: ["aprotoc", "protoc-gen-nos-client-cpp"],
     cmd: GEN_SERVICE_HEADER,
 }
@@ -42,7 +50,11 @@ genrule {
 genrule {
     name: "nos_app_avb_service_genc++_mock",
     out: ["MockAvb.client.h"],
-    srcs: ["avb.proto"],
+    srcs: [
+        "avb.proto",
+        ":nugget_options_proto",
+        ":libprotobuf-internal-protos",
+    ],
     tools: ["aprotoc", "protoc-gen-nos-client-cpp"],
     cmd: GEN_SERVICE_MOCK,
 }
diff --git a/nugget/proto/nugget/app/identity/Android.bp b/nugget/proto/nugget/app/identity/Android.bp
index b65297a..c557182 100644
--- a/nugget/proto/nugget/app/identity/Android.bp
+++ b/nugget/proto/nugget/app/identity/Android.bp
@@ -26,7 +26,13 @@ package {
 genrule {
     name: "nos_app_identity_service_genc++",
     out: ["Identity.client.cpp"],
-    srcs: ["identity.proto"],
+    srcs: [
+        "identity.proto",
+        "identity_defs.proto",
+        "identity_types.proto",
+        ":nugget_options_proto",
+        ":libprotobuf-internal-protos",
+    ],
     tools: ["aprotoc", "protoc-gen-nos-client-cpp"],
     cmd: GEN_SERVICE_SOURCE,
 }
@@ -34,7 +40,13 @@ genrule {
 genrule {
     name: "nos_app_identity_service_genc++_headers",
     out: ["Identity.client.h"],
-    srcs: ["identity.proto"],
+    srcs: [
+        "identity.proto",
+        "identity_defs.proto",
+        "identity_types.proto",
+        ":nugget_options_proto",
+        ":libprotobuf-internal-protos",
+    ],
     tools: ["aprotoc", "protoc-gen-nos-client-cpp"],
     cmd: GEN_SERVICE_HEADER,
 }
@@ -42,7 +54,13 @@ genrule {
 genrule {
     name: "nos_app_identity_service_genc++_mock",
     out: ["MockIdentity.client.h"],
-    srcs: ["identity.proto"],
+    srcs: [
+        "identity.proto",
+        "identity_defs.proto",
+        "identity_types.proto",
+        ":nugget_options_proto",
+        ":libprotobuf-internal-protos",
+    ],
     tools: ["aprotoc", "protoc-gen-nos-client-cpp"],
     cmd: GEN_SERVICE_MOCK,
 }
diff --git a/nugget/proto/nugget/app/identity/identity_types.proto b/nugget/proto/nugget/app/identity/identity_types.proto
index 4c50f2c..66420a1 100644
--- a/nugget/proto/nugget/app/identity/identity_types.proto
+++ b/nugget/proto/nugget/app/identity/identity_types.proto
@@ -18,7 +18,6 @@ syntax = "proto3";
 
 package nugget.app.identity;
 
-import "nugget/protobuf/options.proto";
 import "nugget/app/identity/identity_defs.proto";
 
 message Result {
diff --git a/nugget/proto/nugget/app/keymaster/Android.bp b/nugget/proto/nugget/app/keymaster/Android.bp
index 32e3479..8afadc9 100644
--- a/nugget/proto/nugget/app/keymaster/Android.bp
+++ b/nugget/proto/nugget/app/keymaster/Android.bp
@@ -26,7 +26,13 @@ package {
 genrule {
     name: "nos_app_keymaster_service_genc++",
     out: ["Keymaster.client.cpp"],
-    srcs: ["keymaster.proto"],
+    srcs: [
+        "keymaster.proto",
+        "keymaster_defs.proto",
+        "keymaster_types.proto",
+        ":nugget_options_proto",
+        ":libprotobuf-internal-protos",
+    ],
     tools: ["aprotoc", "protoc-gen-nos-client-cpp"],
     cmd: GEN_SERVICE_SOURCE,
 }
@@ -34,7 +40,13 @@ genrule {
 genrule {
     name: "nos_app_keymaster_service_genc++_headers",
     out: ["Keymaster.client.h"],
-    srcs: ["keymaster.proto"],
+    srcs: [
+        "keymaster.proto",
+        "keymaster_defs.proto",
+        "keymaster_types.proto",
+        ":nugget_options_proto",
+        ":libprotobuf-internal-protos",
+    ],
     tools: ["aprotoc", "protoc-gen-nos-client-cpp"],
     cmd: GEN_SERVICE_HEADER,
 }
@@ -42,7 +54,13 @@ genrule {
 genrule {
     name: "nos_app_keymaster_service_genc++_mock",
     out: ["MockKeymaster.client.h"],
-    srcs: ["keymaster.proto"],
+    srcs: [
+        "keymaster.proto",
+        "keymaster_defs.proto",
+        "keymaster_types.proto",
+        ":nugget_options_proto",
+        ":libprotobuf-internal-protos",
+    ],
     tools: ["aprotoc", "protoc-gen-nos-client-cpp"],
     cmd: GEN_SERVICE_MOCK,
 }
diff --git a/nugget/proto/nugget/app/weaver/Android.bp b/nugget/proto/nugget/app/weaver/Android.bp
index 6a1dbde..1c4535a 100644
--- a/nugget/proto/nugget/app/weaver/Android.bp
+++ b/nugget/proto/nugget/app/weaver/Android.bp
@@ -26,7 +26,11 @@ package {
 genrule {
     name: "nos_app_weaver_service_genc++",
     out: ["Weaver.client.cpp"],
-    srcs: ["weaver.proto"],
+    srcs: [
+        "weaver.proto",
+        ":nugget_options_proto",
+        ":libprotobuf-internal-protos",
+    ],
     tools: ["aprotoc", "protoc-gen-nos-client-cpp"],
     cmd: GEN_SERVICE_SOURCE,
 }
@@ -34,7 +38,11 @@ genrule {
 genrule {
     name: "nos_app_weaver_service_genc++_headers",
     out: ["Weaver.client.h"],
-    srcs: ["weaver.proto"],
+    srcs: [
+        "weaver.proto",
+        ":nugget_options_proto",
+        ":libprotobuf-internal-protos",
+    ],
     tools: ["aprotoc", "protoc-gen-nos-client-cpp"],
     cmd: GEN_SERVICE_HEADER,
 }
@@ -42,7 +50,11 @@ genrule {
 genrule {
     name: "nos_app_weaver_service_genc++_mock",
     out: ["MockWeaver.client.h"],
-    srcs: ["weaver.proto"],
+    srcs: [
+        "weaver.proto",
+        ":nugget_options_proto",
+        ":libprotobuf-internal-protos",
+    ],
     tools: ["aprotoc", "protoc-gen-nos-client-cpp"],
     cmd: GEN_SERVICE_MOCK,
 }