diff options
| author | 2017-11-11 02:32:01 +0000 | |
|---|---|---|
| committer | 2017-11-11 02:32:01 +0000 | |
| commit | ef0cda6388cadff3bb4fe1c2dbf87f6d2f98bab0 (patch) | |
| tree | 49fa1ebc3c246c370b0eb82010c0db637fb2cf5e | |
| parent | 67e1f2e2c99a5c9ea3d9ffbdb8423575625fe6e6 (diff) | |
| parent | e31b25632ecf4344ac55817b0fa03041ca07d9f4 (diff) | |
Merge "Use -Werror in frameworks/base/core/tests/webkit/apk_with_native_libs"
| -rw-r--r-- | core/tests/webkit/apk_with_native_libs/Android.mk | 3 | ||||
| -rw-r--r-- | core/tests/webkit/apk_with_native_libs/jni/WebViewTestJniOnLoad.cpp | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/core/tests/webkit/apk_with_native_libs/Android.mk b/core/tests/webkit/apk_with_native_libs/Android.mk index 7c6c36e0a6a2..c51de6a7897e 100644 --- a/core/tests/webkit/apk_with_native_libs/Android.mk +++ b/core/tests/webkit/apk_with_native_libs/Android.mk @@ -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) diff --git a/core/tests/webkit/apk_with_native_libs/jni/WebViewTestJniOnLoad.cpp b/core/tests/webkit/apk_with_native_libs/jni/WebViewTestJniOnLoad.cpp index 9b0502fc286d..0ced4ee12ac5 100644 --- a/core/tests/webkit/apk_with_native_libs/jni/WebViewTestJniOnLoad.cpp +++ b/core/tests/webkit/apk_with_native_libs/jni/WebViewTestJniOnLoad.cpp @@ -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; } |