commit 60c9678cfa568536596dd66ba920d04bd806ed35
author Steven Moreland <smoreland@google.com> Tue Apr 23 16:03:18 2019 -0700
committer android-build-team Robot <android-build-team-robot@google.com> Tue May 14 04:58:55 2019 +0000
tree 7cd8ec61a8df8a63ee1b7b25ea8276591ae07036
parent fab4a3fa419158001944ec0a439fd4471881aa77

Zero hidl-generated structs

Bug: 131356202
Test: boot, lshal
Change-Id: I8fb10532b6fdf9afa419f19fc634981e7cbd3c10
Merged-In: I8fb10532b6fdf9afa419f19fc634981e7cbd3c10
(cherry picked from commit c0a87677e806ee54748dac040360332b84c494ba)

Interface.cpp

diff --git a/Interface.cpp b/Interface.cpp
index d18ceaa..1c66b31 100644
--- a/Interface.cpp
+++ b/Interface.cpp
@@ -382,23 +382,23 @@
             {IMPL_INTERFACE,
                 [](auto &out) {
                     // getDebugInfo returns N/A for local objects.
-                    out << "_hidl_cb({ -1 /* pid */, 0 /* ptr */, \n"
-                        << sArch
-                        << "});\n"
-                        << "return ::android::hardware::Void();";
+                    out << "::android::hidl::base::V1_0::DebugInfo info = {};\n";
+                    out << "info.pid = -1;\n";
+                    out << "info.ptr = 0;\n";
+                    out << "info.arch = \n" << sArch << ";\n";
+                    out << "_hidl_cb(info);\n";
+                    out << "return ::android::hardware::Void();\n";
                 }
             },
             {IMPL_STUB_IMPL,
                 [](auto &out) {
-                    out << "_hidl_cb(";
-                    out.block([&] {
-                        out << "::android::hardware::details::getPidIfSharable(),\n"
-                            << "::android::hardware::details::debuggable()"
-                            << "? reinterpret_cast<uint64_t>(this) : 0 /* ptr */,\n"
-                            << sArch << "\n";
-                    });
-                    out << ");\n"
-                        << "return ::android::hardware::Void();";
+                    out << "::android::hidl::base::V1_0::DebugInfo info = {};\n";
+                    out << "info.pid = ::android::hardware::details::getPidIfSharable();\n";
+                    out << "info.ptr = ::android::hardware::details::debuggable()"
+                        << "? reinterpret_cast<uint64_t>(this) : 0;\n";
+                    out << "info.arch = \n" << sArch << ";\n";
+                    out << "_hidl_cb(info);\n";
+                    out << "return ::android::hardware::Void();\n";
                 }
             }
         }, /* cppImpl */