| commit | 84c38b6e3978ab7391ab1a2a696bfd4627401097 | [log] [tgz] |
|---|---|---|
| author | Tom Hughes <[email protected]> | Thu Mar 09 00:43:41 2023 |
| committer | Chromeos LUCI <[email protected]> | Thu Mar 09 19:22:38 2023 |
| tree | 0a19f3a7d964bb9c758c96e942eddf3ec8c127fa | |
| parent | c1a2213d4dd7f89103213a881c852ebaf4e806af [diff] |
Fix compilation with updated googletest Newer verisons of googletest define the macro, so check that it's not defined first. Once googletest is uprev'ed the TODO and #define can be removed. BUG=b:269182434 TEST=CQ passes Change-Id: I87be35facfa1d78896ee8987aee53110e28aeaf8 Reviewed-on: https://chromium-review.googlesource.com/c/aosp/platform/hardware/interfaces/neuralnetworks/+/4322206 Reviewed-by: Jim Pollock <[email protected]> Tested-by: Tom Hughes <[email protected]> Commit-Queue: Tom Hughes <[email protected]>
diff --git a/1.0/vts/functional/include/1.0/Utils.h b/1.0/vts/functional/include/1.0/Utils.h index cdd2f35..dcf74fa 100644 --- a/1.0/vts/functional/include/1.0/Utils.h +++ b/1.0/vts/functional/include/1.0/Utils.h
@@ -33,7 +33,9 @@ #include "TestHarness.h" //TODO(jmpollock) Need to uprev gtest to get the correct implemenation of this. +#ifndef GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST #define GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(T) +#endif namespace android::hardware::neuralnetworks {
diff --git a/aidl/vts/functional/Utils.h b/aidl/vts/functional/Utils.h index b4b89af..490435c 100644 --- a/aidl/vts/functional/Utils.h +++ b/aidl/vts/functional/Utils.h
@@ -39,7 +39,9 @@ //TODO(jmpollock) Need to uprev gtest to get the correct implemenation of this. +#ifndef GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST #define GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(T) +#endif namespace aidl::android::hardware::neuralnetworks {