Merge "Remove deprecated constexpr storage from test." into main am: ef727660e8 am: de582ad23e am: a8430f2610

Original change: https://android-review.googlesource.com/c/platform/libnativehelper/+/2768716

Change-Id: I0bd9e89e38e3290e0a83e25bdcca69df15e35930
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 0 insertions, 12 deletions

diff --git a/tests/JniSafeRegisterNativeMethods_test.cpp b/tests/JniSafeRegisterNativeMethods_test.cpp
index e7b0fc4..00571c2 100644
--- a/tests/JniSafeRegisterNativeMethods_test.cpp
+++ b/tests/JniSafeRegisterNativeMethods_test.cpp
@@ -14,24 +14,12 @@
  * limitations under the License.
  */
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wused-but-marked-unused"
-#pragma clang diagnostic ignored "-Wdeprecated"
 #include <gtest/gtest.h>
-#pragma clang diagnostic pop
 #include <sstream>
 
 #define PARSE_FAILURES_NONFATAL  // return empty optionals wherever possible instead of asserting.
 #include "nativehelper/jni_macros.h"
 
-// Provide static storage to these values so they can be used in a runtime context.
-// This has to be defined local to the test translation unit to avoid ODR violations prior to C++17.
-#define STORAGE_FN_FOR_JNI_TRAITS(jtype, ...)                                  \
-constexpr char nativehelper::detail::jni_type_trait<jtype>::type_descriptor[]; \
-constexpr char nativehelper::detail::jni_type_trait<jtype>::type_name[];
-
-DEFINE_JNI_TYPE_TRAIT(STORAGE_FN_FOR_JNI_TRAITS)
-
 template <typename T>
 std::string stringify_helper(const T& val) {
   std::stringstream ss;