X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fbase%2Fandroid%2Fjni_generator%2FtestFromJavaPGenerics.golden;h=5d783909473f5c1e22eb2cadd3ab765ed8b55a96;hb=d41e52f18cc3fee3627acf2db026b2a86c2a9d18;hp=48582fdb21d4d11d8ac7360a7c233aeb6f802a86;hpb=4e9e197c26c34b7055b2c5de6d4a770d317b468c;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/base/android/jni_generator/testFromJavaPGenerics.golden b/src/base/android/jni_generator/testFromJavaPGenerics.golden index 48582fd..5d78390 100644 --- a/src/base/android/jni_generator/testFromJavaPGenerics.golden +++ b/src/base/android/jni_generator/testFromJavaPGenerics.golden @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -21,6 +21,7 @@ namespace { const char kHashSetClassPath[] = "java/util/HashSet"; // Leaking this jclass as we cannot use LazyInstance from some threads. jclass g_HashSet_clazz = NULL; +#define HashSet_clazz(env) g_HashSet_clazz } // namespace @@ -34,11 +35,11 @@ static void Java_HashSet_dummy(JNIEnv* env, jobject obj) __attribute__ static void Java_HashSet_dummy(JNIEnv* env, jobject obj) { /* Must call RegisterNativesImpl() */ CHECK_CLAZZ(env, obj, - g_HashSet_clazz); + HashSet_clazz(env)); jmethodID method_id = base::android::MethodID::LazyGet< base::android::MethodID::TYPE_INSTANCE>( - env, g_HashSet_clazz, + env, HashSet_clazz(env), "dummy", "()V", &g_HashSet_dummy);