diff options
author | Chih-Hung Hsieh <chh@google.com> | 2017-11-02 18:15:05 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-11-02 18:15:05 +0000 |
commit | 8612b559d602e825f2fe1453b6aeb9bd91495f53 (patch) | |
tree | abbf970ea7dd67383471a3532227ffb4c117a831 | |
parent | 9c40502f7d92098bdec63031af5dca87ead8d405 (diff) | |
parent | 1d54ced6863fa16ae92e961c0cb8f344a053acc8 (diff) | |
download | TV-8612b559d602e825f2fe1453b6aeb9bd91495f53.tar.gz |
Use -Werror in packages/apps/TV/jni
am: 1d54ced686
Change-Id: I95e445885300e88053c29027051a1ee598f41e81
-rw-r--r-- | jni/Android.mk | 1 | ||||
-rw-r--r-- | jni/DvbManager.cpp | 3 | ||||
-rw-r--r-- | jni/minijail/Android.mk | 1 | ||||
-rw-r--r-- | jni/tunertvinput_jni.cpp | 4 |
4 files changed, 6 insertions, 3 deletions
diff --git a/jni/Android.mk b/jni/Android.mk index 39923a15..a9c06b34 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -21,6 +21,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := libtunertvinput_jni LOCAL_SRC_FILES += tunertvinput_jni.cpp DvbManager.cpp +LOCAL_CFLAGS := -Wall -Werror LOCAL_SDK_VERSION := 23 LOCAL_NDK_STL_VARIANT := stlport_static LOCAL_LDLIBS := -llog diff --git a/jni/DvbManager.cpp b/jni/DvbManager.cpp index 941a1fa7..d4d35e42 100644 --- a/jni/DvbManager.cpp +++ b/jni/DvbManager.cpp @@ -46,6 +46,7 @@ DvbManager::DvbManager(JNIEnv *env, jobject) mDeliverySystemType(-1), mFeHasLock(false), mHasPendingTune(false) { + (void) mDemuxFd; // suppress unused warning jclass clazz = env->FindClass( "com/android/tv/tuner/TunerHal"); mOpenDvbFrontEndMethodID = env->GetMethodID( @@ -497,4 +498,4 @@ int DvbManager::getDeliverySystemType(JNIEnv *env, jobject thiz) { } } return mDeliverySystemType; -}
\ No newline at end of file +} diff --git a/jni/minijail/Android.mk b/jni/minijail/Android.mk index 940237db..7a3ad584 100644 --- a/jni/minijail/Android.mk +++ b/jni/minijail/Android.mk @@ -21,6 +21,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := libminijail_jni LOCAL_SRC_FILES := minijail.cpp +LOCAL_CFLAGS := -Wall -Werror LOCAL_CXX_STL := none LOCAL_STATIC_LIBRARIES := libc++_static libminijail LOCAL_LDLIBS := -llog diff --git a/jni/tunertvinput_jni.cpp b/jni/tunertvinput_jni.cpp index 5b1a1615..9ad15141 100644 --- a/jni/tunertvinput_jni.cpp +++ b/jni/tunertvinput_jni.cpp @@ -149,7 +149,7 @@ Java_com_android_tv_tuner_TunerHal_nativeWriteInBuffer */ JNIEXPORT void JNICALL Java_com_android_tv_tuner_TunerHal_nativeSetHasPendingTune -(JNIEnv *env, jobject thiz, jlong deviceId, jboolean hasPendingTune) { +(JNIEnv *, jobject, jlong deviceId, jboolean hasPendingTune) { std::map<jlong, DvbManager *>::iterator it = sDvbManagers.find(deviceId); if (it != sDvbManagers.end()) { it->second->setHasPendingTune(hasPendingTune); @@ -172,4 +172,4 @@ Java_com_android_tv_tuner_TunerHal_nativeGetDeliverySystemType sDvbManagers.insert(std::pair<jlong, DvbManager *>(deviceId, dvbManager)); return dvbManager->getDeliverySystemType(env, thiz); } -}
\ No newline at end of file +} |