diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-11 01:53:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-11 01:53:36 +0000 |
| commit | 827909fca34fc144a058ca91cd909bd4265774d0 (patch) | |
| tree | 9553a823c75ac4dd135943420d17f92721455b39 | |
| parent | e73687053448f0b3c300e9366a852155cd75458d (diff) | |
| parent | 318365e869f3e234e7a0e59aaf1dd1de72ea5113 (diff) | |
| download | frameworks_base-827909fca34fc144a058ca91cd909bd4265774d0.zip frameworks_base-827909fca34fc144a058ca91cd909bd4265774d0.tar.gz frameworks_base-827909fca34fc144a058ca91cd909bd4265774d0.tar.bz2 | |
Merge "Frameworks/base: Wall Werror in drm"
| -rw-r--r-- | drm/jni/Android.mk | 4 | ||||
| -rw-r--r-- | drm/jni/android_drm_DrmManagerClient.cpp | 5 |
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; |