commit 836cb31a1df2149cfda4f1844a7a4219b7164c1c
author Steven Moreland <smoreland@google.com> Mon Jun 05 17:25:55 2017 -0700
committer Steven Moreland <smoreland@google.com> Tue Jun 06 01:25:10 2017 +0000
tree 5bcc257447f9143816798edf88fd684a7c04f7f8
parent aeda8cbc1870cce2cdc46e0d293907713bca7e4f

Fix error on user builds with future compiler.

This resolves "Generated code has unused lambda captures"
on future compiler versions.

Test: build hidl modules on user and userdebug variants
Test: boot internal marlin and pass hidl_test
Change-Id: I1b68701646cb4cd860860fb43a3cf276b34e1e2c
Fixes: 37908609

c2hal/test/Android.bp

diff --git a/c2hal/test/Android.bp b/c2hal/test/Android.bp
index 2016901..547a099 100644
--- a/c2hal/test/Android.bp
+++ b/c2hal/test/Android.bp
@@ -67,6 +67,7 @@
 
 cc_test_library {
     name: "c2hal_test",
+    defaults: ["hidl-module-defaults"],
     generated_headers: ["c2hal_test_genc++_headers"],
     generated_sources: ["c2hal_test_genc++"],
     export_generated_headers: ["c2hal_test_genc++_headers"],

generateCpp.cpp

diff --git a/generateCpp.cpp b/generateCpp.cpp
index 3e50c03..79a45a6 100644
--- a/generateCpp.cpp
+++ b/generateCpp.cpp
@@ -697,9 +697,11 @@
     out << "auto _hidl_return = ";
 
     if (method->isOneway()) {
-        out << "addOnewayTask([mImpl = this->mImpl, "
-               "mEnableInstrumentation = this->mEnableInstrumentation, "
-               "mInstrumentationCallbacks = this->mInstrumentationCallbacks";
+        out << "addOnewayTask([mImpl = this->mImpl\n"
+            << "#ifdef __ANDROID_DEBUGGABLE__\n"
+               ", mEnableInstrumentation = this->mEnableInstrumentation, "
+               "mInstrumentationCallbacks = this->mInstrumentationCallbacks\n"
+            << "#endif // __ANDROID_DEBUGGABLE__\n";
         for (const auto &arg : method->args()) {
             out << ", "
                 << (arg->type().isInterface() ? "_hidl_wrapped_" : "")