commit a1b227c5551b207793cfc2f7c0803c791a853c51
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jun 30 20:36:36 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jun 30 20:36:36 2017 +0000
tree 47b11cca9badae558e08a2d68f1b86c27fab2609
parent 73f11e25c9bfd54690d0671ac9d8dc4f9245d86d
parent 3ecd289d82f68451819b0d23730754dae14ec8d0

Merge "Add test for NoSuchElementException in java test."

c2hal/test/test.h

diff --git a/c2hal/test/test.h b/c2hal/test/test.h
index e53e296..b1a0058 100644
--- a/c2hal/test/test.h
+++ b/c2hal/test/test.h
@@ -273,7 +273,7 @@
 
     int (*store_meta_data_in_buffers)(struct camera_device *, int enable);
 
-    typedef void (*scan_result_callback)(bt_bdaddr_t* bda, int rssi, vector<uint8_t> adv_data);
+    typedef void (*scan_result_callback)(FooFooBarFoo* bda, int rssi, vector<uint8_t> adv_data);
 
     pthread_t (* gps_create_thread)(const char* name, void (*start)(void *), void* arg);
 

generateCpp.cpp

diff --git a/generateCpp.cpp b/generateCpp.cpp
index 19fa039..2ff1c51 100644
--- a/generateCpp.cpp
+++ b/generateCpp.cpp
@@ -226,11 +226,15 @@
         out << "#ifdef __ANDROID_TREBLE__\n\n"
             << "#ifdef __ANDROID_DEBUGGABLE__\n"
             << "const char* env = std::getenv(\"TREBLE_TESTING_OVERRIDE\");\n"
-            << "const bool vintfLegacy = (transport == Transport::EMPTY) && env && !strcmp(env, \"true\");\n"
+            << "const bool trebleTestingOverride =  env && !strcmp(env, \"true\");\n"
+            << "const bool vintfLegacy = (transport == Transport::EMPTY) && trebleTestingOverride;\n"
             << "#else // __ANDROID_TREBLE__ but not __ANDROID_DEBUGGABLE__\n"
+            << "const bool trebleTestingOverride = false;\n"
             << "const bool vintfLegacy = false;\n"
             << "#endif // __ANDROID_DEBUGGABLE__\n\n"
             << "#else // not __ANDROID_TREBLE__\n"
+            << "const char* env = std::getenv(\"TREBLE_TESTING_OVERRIDE\");\n"
+            << "const bool trebleTestingOverride =  env && !strcmp(env, \"true\");\n"
             << "const bool vintfLegacy = (transport == Transport::EMPTY);\n\n"
             << "#endif // __ANDROID_TREBLE__\n\n";
 
@@ -329,8 +333,10 @@
                     out << "sp<" << gIBaseFqName.cppName()
                         << "> baseInterface = ret;\n";
                     out.sIf("baseInterface != nullptr", [&]() {
-                        out << "iface = new " << fqName.getInterfacePassthroughName()
-                            << "(" << interfaceName << "::castFrom(baseInterface));\n";
+                        out << "iface = " << interfaceName << "::castFrom(baseInterface);\n";
+                        out.sIf("!getStub || trebleTestingOverride", [&] () {
+                            out << "iface = new " << fqName.getInterfacePassthroughName() << "(iface);\n";
+                        }).endl();
                     }).endl();
                 }).endl();
             }).endl();