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

am 827909fc: Merge "Frameworks/base: Wall Werror in drm"

Browse Source 
* commit '827909fca34fc144a058ca91cd909bd4265774d0':
  Frameworks/base: Wall Werror in drm
This commit is contained in:
Andreas Gampe
2014-11-11 02:16:07 +00:00
committed by Android Git Automerger
parent 6a7ceb57c0 827909fca3
commit 37fcecde6d
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drm/jni/Android.mk
View File

@@ -39,8 +39,8 @@ LOCAL_C_INCLUDES += \
$(TOP)/frameworks/av/include \ $(TOP)/frameworks/av/include \
$(TOP)/libcore/include $(TOP)/libcore/include
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

5
drm/jni/android_drm_DrmManagerClient.cpp
View File

@@ -381,7 +381,8 @@ static jobjectArray android_drm_DrmManagerClient_getAllSupportInfo(
} }
static void android_drm_DrmManagerClient_installDrmEngine( 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"); ALOGV("installDrmEngine - Enter");
//getDrmManagerClient(env, thiz) //getDrmManagerClient(env, thiz)
// ->installDrmEngine(uniqueId, Utility::getStringValue(env, engineFilePath)); // ->installDrmEngine(uniqueId, Utility::getStringValue(env, engineFilePath));
@@ -776,7 +777,7 @@ static int registerNativeMethods(JNIEnv* env) {
return result; return result;
} }
jint JNI_OnLoad(JavaVM* vm, void* reserved) { jint JNI_OnLoad(JavaVM* vm, void* /* reserved */) {
JNIEnv* env = NULL; JNIEnv* env = NULL;
jint result = -1; jint result = -1;