summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2014-11-10 17:23:02 -0800
committerAndreas Gampe <agampe@google.com>2014-11-10 17:23:02 -0800
commit318365e869f3e234e7a0e59aaf1dd1de72ea5113 (patch)
tree0ae8ec115295a6b9e82c868c44539f41672dc894
parenta31318620bce4e00e80188ee2778b7799cbdf0dc (diff)
downloadframeworks_base-318365e869f3e234e7a0e59aaf1dd1de72ea5113.zip
frameworks_base-318365e869f3e234e7a0e59aaf1dd1de72ea5113.tar.gz
frameworks_base-318365e869f3e234e7a0e59aaf1dd1de72ea5113.tar.bz2
Frameworks/base: Wall Werror in drm
Turn on -Wall -Werror in drm/jni. Fix warnings. Change-Id: If24fec45fbb737af593ddadfa473548dfa583e0b
-rw-r--r--drm/jni/Android.mk4
-rw-r--r--drm/jni/android_drm_DrmManagerClient.cpp5
2 files changed, 5 insertions, 4 deletions
diff --git a/drm/jni/Android.mk b/drm/jni/Android.mk
index 474b9b2..08c7b95 100644
--- a/drm/jni/Android.mk
+++ b/drm/jni/Android.mk
@@ -39,8 +39,8 @@ LOCAL_C_INCLUDES += \
$(TOP)/frameworks/av/include \
$(TOP)/libcore/include
-
-
LOCAL_MODULE_TAGS := optional
+LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code
+
include $(BUILD_SHARED_LIBRARY)
diff --git a/drm/jni/android_drm_DrmManagerClient.cpp b/drm/jni/android_drm_DrmManagerClient.cpp
index d321baf..52597e1 100644
--- a/drm/jni/android_drm_DrmManagerClient.cpp
+++ b/drm/jni/android_drm_DrmManagerClient.cpp
@@ -381,7 +381,8 @@ static jobjectArray android_drm_DrmManagerClient_getAllSupportInfo(
}
static void android_drm_DrmManagerClient_installDrmEngine(
- JNIEnv* env, jobject thiz, jint uniqueId, jstring engineFilePath) {
+ JNIEnv* /* env */, jobject /* thiz */, jint /* uniqueId */,
+ jstring /* engineFilePath */) {
ALOGV("installDrmEngine - Enter");
//getDrmManagerClient(env, thiz)
// ->installDrmEngine(uniqueId, Utility::getStringValue(env, engineFilePath));
@@ -776,7 +777,7 @@ static int registerNativeMethods(JNIEnv* env) {
return result;
}
-jint JNI_OnLoad(JavaVM* vm, void* reserved) {
+jint JNI_OnLoad(JavaVM* vm, void* /* reserved */) {
JNIEnv* env = NULL;
jint result = -1;