Merge pie-platform-release to aosp-master - DO NOT MERGE
Change-Id: I7fe49f0a7c984c0f4b466db215d2fc5680044f6b
diff --git a/msm8998/QCamera2/Android.mk b/msm8998/QCamera2/Android.mk
index f2d8d49..534bc1e 100755
--- a/msm8998/QCamera2/Android.mk
+++ b/msm8998/QCamera2/Android.mk
@@ -48,6 +48,11 @@
LOCAL_CFLAGS += -DQCAMERA_HAL3_SUPPORT
else
LOCAL_CFLAGS += -DQCAMERA_HAL1_SUPPORT
+
+# Allow implicit fallthroughs in QCamera2HWI.cpp:6495 and
+# in QCameraStateMaschine.cpp until they are fixed.
+LOCAL_CFLAGS += -Wno-error=implicit-fallthrough
+
LOCAL_SRC_FILES += \
HAL/QCamera2HWI.cpp \
HAL/QCameraMuxer.cpp \
