diff options
author | Andreas Gampe <agampe@google.com> | 2014-11-03 21:36:10 -0800 |
---|---|---|
committer | Andreas Gampe <agampe@google.com> | 2014-11-04 18:40:08 -0800 |
commit | 277ccbd200ea43590dfc06a93ae184a765327ad0 (patch) | |
tree | d89712e93da5fb2748989353c9ee071102cf3f33 /runtime/native_bridge_art_interface.cc | |
parent | ad17d41841ba1fb177fb0bf175ec0e9f5e1412b3 (diff) | |
download | art-277ccbd200ea43590dfc06a93ae184a765327ad0.tar.gz art-277ccbd200ea43590dfc06a93ae184a765327ad0.tar.bz2 art-277ccbd200ea43590dfc06a93ae184a765327ad0.zip |
ART: More warnings
Enable -Wno-conversion-null, -Wredundant-decls and -Wshadow in general,
and -Wunused-but-set-parameter for GCC builds.
Change-Id: I81bbdd762213444673c65d85edae594a523836e5
Diffstat (limited to 'runtime/native_bridge_art_interface.cc')
-rw-r--r-- | runtime/native_bridge_art_interface.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/runtime/native_bridge_art_interface.cc b/runtime/native_bridge_art_interface.cc index f598e27d7b..59922b8c07 100644 --- a/runtime/native_bridge_art_interface.cc +++ b/runtime/native_bridge_art_interface.cc @@ -25,7 +25,7 @@ namespace art { -const char* GetMethodShorty(JNIEnv* env, jmethodID mid) { +static const char* GetMethodShorty(JNIEnv* env, jmethodID mid) { ScopedObjectAccess soa(env); StackHandleScope<1> scope(soa.Self()); mirror::ArtMethod* m = soa.DecodeMethod(mid); @@ -33,7 +33,7 @@ const char* GetMethodShorty(JNIEnv* env, jmethodID mid) { return mh.GetShorty(); } -uint32_t GetNativeMethodCount(JNIEnv* env, jclass clazz) { +static uint32_t GetNativeMethodCount(JNIEnv* env, jclass clazz) { if (clazz == nullptr) return 0; @@ -56,8 +56,8 @@ uint32_t GetNativeMethodCount(JNIEnv* env, jclass clazz) { return native_method_count; } -uint32_t GetNativeMethods(JNIEnv* env, jclass clazz, JNINativeMethod* methods, - uint32_t method_count) { +static uint32_t GetNativeMethods(JNIEnv* env, jclass clazz, JNINativeMethod* methods, + uint32_t method_count) { if ((clazz == nullptr) || (methods == nullptr)) { return 0; } @@ -121,6 +121,8 @@ void PreInitializeNativeBridge(std::string dir) { LOG(WARNING) << "Could not create mount namespace."; } android::PreInitializeNativeBridge(dir.c_str(), GetInstructionSetString(kRuntimeISA)); +#else + UNUSED(dir); #endif } |