Snap for 10950137 from 7e11c06a19d9aee00d5dc250265ce525b520e2d6 to 24Q1-releaseandroid-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: I0ad901f96f77300702ec0b8eafa2f0350ad98fd9

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;