From 294a9152688dfdf28cbb4c1d9b73d1605a7084d2 Mon Sep 17 00:00:00 2001
From: Igor Murashkin <iam@google.com>
Date: Wed, 28 Sep 2016 13:23:19 -0700
Subject: [PATCH] jni: test CriticalNative with generic jni

Previously this combination was uncovered due to a missing
line in the macro definition.

Bug: 31400248
Test: make test-art-host
Change-Id: I5407f46f2394edc028c9b74dc783899a3a2f6588
---
 compiler/jni/jni_compiler_test.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/compiler/jni/jni_compiler_test.cc b/compiler/jni/jni_compiler_test.cc
index b692c6d9a..14301884d 100644
--- a/compiler/jni/jni_compiler_test.cc
+++ b/compiler/jni/jni_compiler_test.cc
@@ -431,6 +431,7 @@ jobject JniCompilerTest::class_loader_;
   TEST_F(JniCompilerTest, TestName ## CriticalGeneric) { \
     SCOPED_TRACE("@CriticalNative JNI with generic");  \
     gCurrentJni = static_cast<uint32_t>(JniKind::kCritical); \
+    SetCheckGenericJni(true);                    \
     TestName ## Impl();                          \
   }
 
-- 
2.11.0