Snap for 11273583 from 349f8fc61dfcde3c2955a988cb809e9f8e863cb6 to mainline-wifi-release

Change-Id: If5e5aef1247115f624481b5c2c521b718c912bc3
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",