Suppress Clang compiler warnings.
This is a temporary workaround to compile these modules until
we have a simple method to clean up both AOSP and upstream code.
BUG: 18193625
Change-Id: I15d852d08db7e87278f09e32dbbbe50591395d33
diff --git a/camera/QCamera2/Android.mk b/camera/QCamera2/Android.mk
index 9cf5509..2f6149f 100644
--- a/camera/QCamera2/Android.mk
+++ b/camera/QCamera2/Android.mk
@@ -4,6 +4,20 @@
include $(CLEAR_VARS)
+# QCameraParameters.h has unused private field.
+# QCamera2Hal.cpp, QCamera3HWI.cpp, etc. use GNU old-style field designator extension.
+# QCamera3PostProc.cpp has unused label.
+# QCamera3HWI.cpp, QCamera3PostProc.cpp etc. have unused variable.
+# QCamera3Channel.cpp compares array to null pointer.
+# QCamera2Factory.cpp, QCamera3HWI.cpp, etc. have unused parameter.
+LOCAL_CLANG_CFLAGS += \
+ -Wno-error=unused-private-field \
+ -Wno-error=gnu-designator \
+ -Wno-error=unused-label \
+ -Wno-error=unused-variable \
+ -Wno-error=unused-parameter \
+ -Wno-error=tautological-pointer-compare \
+
LOCAL_SRC_FILES := \
util/QCameraCmdThread.cpp \
util/QCameraQueue.cpp \
diff --git a/camera/QCamera2/stack/mm-camera-interface/Android.mk b/camera/QCamera2/stack/mm-camera-interface/Android.mk
index 194c5bf..9239f8a 100644
--- a/camera/QCamera2/stack/mm-camera-interface/Android.mk
+++ b/camera/QCamera2/stack/mm-camera-interface/Android.mk
@@ -4,6 +4,12 @@
include $(LOCAL_PATH)/../../../common.mk
include $(CLEAR_VARS)
+# cam_intf.c has type conversion discarding qualifiers.
+# mm_camera_interface.c has incomplete field initializer.
+LOCAL_CLANG_CFLAGS += \
+ -Wno-error=incompatible-pointer-types-discards-qualifiers \
+ -Wno-error=missing-field-initializers \
+
MM_CAM_FILES := \
src/mm_camera_interface.c \
src/mm_camera.c \
diff --git a/camera/QCamera2/stack/mm-camera-test/Android.mk b/camera/QCamera2/stack/mm-camera-test/Android.mk
index 9d33c6e..b4c36e3 100644
--- a/camera/QCamera2/stack/mm-camera-test/Android.mk
+++ b/camera/QCamera2/stack/mm-camera-test/Android.mk
@@ -17,6 +17,10 @@
LOCAL_CFLAGS += -D_ANDROID_
+# mm_qcamera_main_menu.c has implicit conversion from enum to enum.
+LOCAL_CLANG_CFLAGS += \
+ -Wno-error=enum-conversion \
+
LOCAL_SRC_FILES:= \
src/mm_qcamera_main_menu.c \
src/mm_qcamera_app.c \
@@ -125,6 +129,10 @@
LOCAL_CFLAGS += -D_ANDROID_
+# mm_qcamera_main_menu.c has implicit conversion from enum to enum.
+LOCAL_CLANG_CFLAGS += \
+ -Wno-error=enum-conversion \
+
LOCAL_SRC_FILES:= \
src/mm_qcamera_main_menu.c \
src/mm_qcamera_app.c \
