Merge "Use -Werror in frameworks/base/core/tests/webkit/apk_with_native_libs" (ef0cda63) · Commits · e / os / android_frameworks_base

core/tests/webkit/apk_with_native_libs/Android.mk

+3 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ MY_MODULE_TAGS := optional
		MY_JNI_SHARED_LIBRARIES := libwebviewtest_jni
		MY_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
		MY_SRC_FILES := $(call all-java-files-under, src)
		MY_CFLAGS := -Wall -Werror
		MY_SDK_VERSION := system_current
		MY_PROGUARD_ENABLED := disabled
		MY_MULTILIB := both
		@@ -40,6 +41,7 @@ LOCAL_MODULE_TAGS := $(MY_MODULE_TAGS)
		LOCAL_JNI_SHARED_LIBRARIES := $(MY_JNI_SHARED_LIBRARIES)
		LOCAL_MODULE_PATH := $(MY_MODULE_PATH)
		LOCAL_SRC_FILES := $(MY_SRC_FILES)
		LOCAL_CFLAGS := $(MY_CFLAGS)
		LOCAL_SDK_VERSION := $(MY_SDK_VERSION)
		LOCAL_PROGUARD_ENABLED := $(MY_PROGUARD_ENABLED)
		LOCAL_MULTILIB := $(MY_MULTILIB)
		@@ -59,6 +61,7 @@ LOCAL_MODULE_TAGS := $(MY_MODULE_TAGS)
		LOCAL_JNI_SHARED_LIBRARIES := $(MY_JNI_SHARED_LIBRARIES)
		LOCAL_MODULE_PATH := $(MY_MODULE_PATH)
		LOCAL_SRC_FILES := $(MY_SRC_FILES)
		LOCAL_CFLAGS := $(MY_CFLAGS)
		LOCAL_SDK_VERSION := $(MY_SDK_VERSION)
		LOCAL_PROGUARD_ENABLED := $(MY_PROGUARD_ENABLED)
		LOCAL_MULTILIB := $(MY_MULTILIB)

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,6 +16,6 @@

		#include <jni.h>

		jint JNI_OnLoad(JavaVM vm, void reserved) {
		jint JNI_OnLoad(JavaVM * /vm/, void * /reserved/) {
		return JNI_VERSION_1_4;
		}