commit 2d9f4e0aef48ee7c65a671e799fe34dc22c9b4a0
author Brian Daniels <briandaniels@google.com> Tue Dec 12 19:20:30 2023 +0000
committer Android Partner Code Review <android-gerrit-partner@google.com> Tue Dec 12 19:20:30 2023 +0000
tree ab32f76c927461950bd65da692cfb5b794fe4830
parent 90883b0cb542ea31d370336f45f300e1577b9ca8
parent a18c60fea9b9a12ced26b45957cbff2b4ce7f1c2

Merge "Sensor HAL 2.1 Migration"

hal/vehicle/2.0/Android.bp

diff --git a/hal/vehicle/2.0/Android.bp b/hal/vehicle/2.0/Android.bp
index 05f4886..d593231 100644
--- a/hal/vehicle/2.0/Android.bp
+++ b/hal/vehicle/2.0/Android.bp
@@ -65,7 +65,7 @@
         "aprotoc",
         "protoc-gen-grpc-cpp-plugin",
     ],
-    cmd: "$(location aprotoc) -Idevice/google/trout/hal/vehicle/2.0/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)",
+    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",
@@ -83,7 +83,7 @@
         "aprotoc",
         "protoc-gen-grpc-cpp-plugin",
     ],
-    cmd: "$(location aprotoc) -Idevice/google/trout/hal/vehicle/2.0/proto -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",

tools/tracing/proto/Android.bp

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",