Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 37079e29: Merge "Frameworks/base: Wall Werror in packages"

Browse Source 
* commit '37079e29171df20b6355244882dce9d745da55db':
  Frameworks/base: Wall Werror in packages
This commit is contained in:
Andreas Gampe
2014-11-13 23:39:49 +00:00
committed by Android Git Automerger
parent 035a7b0235 37079e2917
commit d99c25eff3
7 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/DefaultContainerService/jni/Android.mk
View File

@@ -18,8 +18,6 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
com_android_defcontainer_MeasurementUtils.cpp com_android_defcontainer_MeasurementUtils.cpp
@@ -37,4 +35,6 @@ LOCAL_STATIC_LIBRARIES := \
LOCAL_MODULE := libdefcontainer_jni LOCAL_MODULE := libdefcontainer_jni
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

4
packages/DefaultContainerService/jni/com_android_defcontainer_MeasurementUtils.cpp
View File

@@ -29,7 +29,7 @@
namespace android { namespace android {
static jlong native_measureDirectory(JNIEnv* env, jobject clazz, jstring directory) { static jlong native_measureDirectory(JNIEnv* env, jobject /* clazz */, jstring directory) {
jlong ret = 0L; jlong ret = 0L;
const char* path = env->GetStringUTFChars(directory, NULL); const char* path = env->GetStringUTFChars(directory, NULL);
@@ -65,7 +65,7 @@ int register_com_android_defcontainer(JNIEnv *env) {
} // namespace android } // namespace android
int JNI_OnLoad(JavaVM *jvm, void* reserved) { int JNI_OnLoad(JavaVM *jvm, void* /* reserved */) {
JNIEnv *env; JNIEnv *env;
if (jvm->GetEnv((void**)&env, JNI_VERSION_1_6)) { if (jvm->GetEnv((void**)&env, JNI_VERSION_1_6)) {

2
packages/PrintSpooler/jni/Android.mk
View File

@@ -16,4 +16,6 @@ LOCAL_SHARED_LIBRARIES := \
LOCAL_MODULE := libprintspooler_jni LOCAL_MODULE := libprintspooler_jni
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

4
packages/PrintSpooler/jni/com_android_printspooler_util_BitmapSerializeUtils.cpp
View File

@@ -79,7 +79,7 @@ static void throwIllegalArgumentException(JNIEnv* env, char* message) {
throwException(env, className, message); throwException(env, className, message);
} }
static void readBitmapPixels(JNIEnv* env, jclass clazz, jobject jbitmap, jint fd) { static void readBitmapPixels(JNIEnv* env, jclass /* clazz */, jobject jbitmap, jint fd) {
// Read the info. // Read the info.
AndroidBitmapInfo readInfo; AndroidBitmapInfo readInfo;
bool read = readAllBytes(fd, (void*) &readInfo, sizeof(AndroidBitmapInfo)); bool read = readAllBytes(fd, (void*) &readInfo, sizeof(AndroidBitmapInfo));
@@ -127,7 +127,7 @@ static void readBitmapPixels(JNIEnv* env, jclass clazz, jobject jbitmap, jint fd
} }
} }
static void writeBitmapPixels(JNIEnv* env, jclass clazz, jobject jbitmap, jint fd) { static void writeBitmapPixels(JNIEnv* env, jclass /* clazz */, jobject jbitmap, jint fd) {
// Get the info. // Get the info.
AndroidBitmapInfo info; AndroidBitmapInfo info;
int result = AndroidBitmap_getInfo(env, jbitmap, &info); int result = AndroidBitmap_getInfo(env, jbitmap, &info);

2
packages/services/PacProcessor/jni/Android.mk
View File

@@ -36,4 +36,6 @@ LOCAL_SHARED_LIBRARIES := \
LOCAL_MODULE := libjni_pacprocessor LOCAL_MODULE := libjni_pacprocessor
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

4
packages/services/PacProcessor/jni/com_android_pacprocessor_PacNative.cpp
View File

@@ -60,7 +60,7 @@ jstring string16ToJstring(JNIEnv* env, String16 string) {
return env->NewString(str, len); return env->NewString(str, len);
} }
static jboolean com_android_pacprocessor_PacNative_createV8ParserNativeLocked(JNIEnv* env, static jboolean com_android_pacprocessor_PacNative_createV8ParserNativeLocked(JNIEnv* /* env */,
jobject) { jobject) {
if (proxyResolver == NULL) { if (proxyResolver == NULL) {
logger = new ProxyErrorLogger(); logger = new ProxyErrorLogger();
@@ -72,7 +72,7 @@ static jboolean com_android_pacprocessor_PacNative_createV8ParserNativeLocked(JN
return JNI_TRUE; return JNI_TRUE;
} }
static jboolean com_android_pacprocessor_PacNative_destroyV8ParserNativeLocked(JNIEnv* env, static jboolean com_android_pacprocessor_PacNative_destroyV8ParserNativeLocked(JNIEnv* /* env *,
jobject) { jobject) {
if (proxyResolver != NULL) { if (proxyResolver != NULL) {
delete logger; delete logger;

2
packages/services/PacProcessor/jni/jni_init.cpp
View File

@@ -25,7 +25,7 @@ namespace android {
using namespace android; using namespace android;
extern "C" jint JNI_OnLoad(JavaVM* vm, void* reserved) { extern "C" jint JNI_OnLoad(JavaVM* vm, void* /* reserved */) {
JNIEnv *env; JNIEnv *env;
if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) { if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) {
ALOGE("ERROR: GetEnv failed"); ALOGE("ERROR: GetEnv failed");