Snap for 11181721 from 349f8fc61dfcde3c2955a988cb809e9f8e863cb6 to mainline-os-statsd-release
Change-Id: Ic5f1b10adfde8ea2bc74ed811098e218417def53
diff --git a/hal/dumpstate/aidl/1.0/Android.bp b/hal/dumpstate/aidl/1.0/Android.bp
index 5b80ae0..d00f97a 100644
--- a/hal/dumpstate/aidl/1.0/Android.bp
+++ b/hal/dumpstate/aidl/1.0/Android.bp
@@ -24,9 +24,10 @@
"aprotoc",
"protoc-gen-grpc-cpp-plugin",
],
- cmd: "$(location aprotoc) -I$$(dirname $(in)) -Iexternal/protobuf/src --plugin=protoc-gen-grpc=$(location protoc-gen-grpc-cpp-plugin) $(in) --grpc_out=$(genDir) --cpp_out=$(genDir)",
+ cmd: "$(location aprotoc) -Idevice/google/trout/hal/dumpstate/aidl/1.0/proto -Iexternal/protobuf/src --plugin=protoc-gen-grpc=$(location protoc-gen-grpc-cpp-plugin) $(location proto/DumpstateServer.proto) --grpc_out=$(genDir) --cpp_out=$(genDir)",
srcs: [
"proto/DumpstateServer.proto",
+ ":libprotobuf-internal-protos",
],
out: [
"DumpstateServer.pb.h",
@@ -40,9 +41,10 @@
"aprotoc",
"protoc-gen-grpc-cpp-plugin",
],
- cmd: "$(location aprotoc) -I$$(dirname $(in)) -Iexternal/protobuf/src --plugin=protoc-gen-grpc=$(location protoc-gen-grpc-cpp-plugin) $(in) --grpc_out=$(genDir) --cpp_out=$(genDir)",
+ cmd: "$(location aprotoc) -Idevice/google/trout/hal/dumpstate/aidl/1.0/proto -Iexternal/protobuf/src --plugin=protoc-gen-grpc=$(location protoc-gen-grpc-cpp-plugin) $(location proto/DumpstateServer.proto) --grpc_out=$(genDir) --cpp_out=$(genDir)",
srcs: [
"proto/DumpstateServer.proto",
+ ":libprotobuf-internal-protos",
],
out: [
"DumpstateServer.pb.cc",
diff --git a/hal/vehicle/2.0/Android.bp b/hal/vehicle/2.0/Android.bp
index ba39666..d593231 100644
--- a/hal/vehicle/2.0/Android.bp
+++ b/hal/vehicle/2.0/Android.bp
@@ -65,9 +65,11 @@
"aprotoc",
"protoc-gen-grpc-cpp-plugin",
],
- cmd: "$(location aprotoc) -I$$(dirname $(in)) -Ihardware/interfaces/automotive/vehicle/proto -Iexternal/protobuf/src --plugin=protoc-gen-grpc=$(location protoc-gen-grpc-cpp-plugin) $(in) --grpc_out=$(genDir) --cpp_out=$(genDir)",
+ cmd: "$(location aprotoc) -I$$(dirname $(location proto/VehicleServer.proto)) -Ihardware/interfaces/automotive/vehicle/proto -Iexternal/protobuf/src --plugin=protoc-gen-grpc=$(location protoc-gen-grpc-cpp-plugin) $(location proto/VehicleServer.proto) --grpc_out=$(genDir) --cpp_out=$(genDir)",
srcs: [
"proto/VehicleServer.proto",
+ ":vhal-proto-src",
+ ":libprotobuf-internal-protos",
],
out: [
"VehicleServer.pb.h",
@@ -81,9 +83,11 @@
"aprotoc",
"protoc-gen-grpc-cpp-plugin",
],
- cmd: "$(location aprotoc) -I$$(dirname $(in)) -Ihardware/interfaces/automotive/vehicle/proto -Iexternal/protobuf/src --plugin=protoc-gen-grpc=$(location protoc-gen-grpc-cpp-plugin) $(in) --grpc_out=$(genDir) --cpp_out=$(genDir)",
+ cmd: "$(location aprotoc) -I$$(dirname $(location proto/VehicleServer.proto)) -Ihardware/interfaces/automotive/vehicle/proto -Iexternal/protobuf/src --plugin=protoc-gen-grpc=$(location protoc-gen-grpc-cpp-plugin) $(location proto/VehicleServer.proto) --grpc_out=$(genDir) --cpp_out=$(genDir)",
srcs: [
"proto/VehicleServer.proto",
+ ":vhal-proto-src",
+ ":libprotobuf-internal-protos",
],
out: [
"VehicleServer.pb.cc",
diff --git a/tools/tracing/proto/Android.bp b/tools/tracing/proto/Android.bp
index 1ac8d77..7093ddd 100644
--- a/tools/tracing/proto/Android.bp
+++ b/tools/tracing/proto/Android.bp
@@ -24,9 +24,10 @@
"aprotoc",
"protoc-gen-grpc-cpp-plugin",
],
- cmd: "$(location aprotoc) -I$$(dirname $(in)) --plugin=protoc-gen-grpc=$(location protoc-gen-grpc-cpp-plugin) $(in) --grpc_out=$(genDir) --cpp_out=$(genDir)",
+ cmd: "$(location aprotoc) -I$$(dirname $(location TracingVM.proto)) --plugin=protoc-gen-grpc=$(location protoc-gen-grpc-cpp-plugin) $(location TracingVM.proto) --grpc_out=$(genDir) --cpp_out=$(genDir)",
srcs: [
"TracingVM.proto",
+ "perfetto_trace.proto",
],
out: [
"TracingVM.pb.h",
@@ -40,9 +41,10 @@
"aprotoc",
"protoc-gen-grpc-cpp-plugin",
],
- cmd: "$(location aprotoc) -I$$(dirname $(in)) --plugin=protoc-gen-grpc=$(location protoc-gen-grpc-cpp-plugin) $(in) --grpc_out=$(genDir) --cpp_out=$(genDir)",
+ cmd: "$(location aprotoc) -I$$(dirname $(location TracingVM.proto)) --plugin=protoc-gen-grpc=$(location protoc-gen-grpc-cpp-plugin) $(location TracingVM.proto) --grpc_out=$(genDir) --cpp_out=$(genDir)",
srcs: [
"TracingVM.proto",
+ "perfetto_trace.proto",
],
out: [
"TracingVM.pb.cc",
