commit 0fff59b9615bdb51be5b11e7e1a8031e38c2f23a
author Slava Shklyaev <slavash@google.com> Fri Jan 31 15:14:24 2020 +0000
committer Slava Shklyaev <slavash@google.com> Wed Feb 19 11:58:34 2020 +0000
tree 139adb0e29d92e000f715deb9fbe1519688256b1
parent 315e9b8924669eef40a3bf683f2b5088b8c3e088

Add control flow support to NNAPI VTS tests

See change I98a3edd1.

Bug: 148077633
Bug: 148601177
Bug: 136735929
Test: VtsHalNeuralnetworksV1_0TargetTest
Test: VtsHalNeuralnetworksV1_1TargetTest
Test: VtsHalNeuralnetworksV1_2TargetTest
Test: VtsHalNeuralnetworksV1_3TargetTest
Change-Id: I1e436cdba404b68026a45797ac4fb3a34f8be76a
Merged-In: I1e436cdba404b68026a45797ac4fb3a34f8be76a
(cherry picked from commit 1f98e2e9292faf4c2a28a4558a303492d4f7eefe)

neuralnetworks/1.2/vts/functional/CompilationCachingTests.cpp

diff --git a/neuralnetworks/1.2/vts/functional/CompilationCachingTests.cpp b/neuralnetworks/1.2/vts/functional/CompilationCachingTests.cpp
index 2130a76..10dec79 100644
--- a/neuralnetworks/1.2/vts/functional/CompilationCachingTests.cpp
+++ b/neuralnetworks/1.2/vts/functional/CompilationCachingTests.cpp
@@ -207,10 +207,10 @@
     };
 
     return {
-            .operands = std::move(operands),
-            .operations = std::move(operations),
-            .inputIndexes = {1},
-            .outputIndexes = {len * 2 + 1},
+            .main = {.operands = std::move(operands),
+                     .operations = std::move(operations),
+                     .inputIndexes = {1},
+                     .outputIndexes = {len * 2 + 1}},
             .isRelaxed = false,
     };
 }