commit c19a11a46dcb916a7964bb8281bd6838a8d45019
author Andreas Gampe <agampe@google.com> Wed Aug 05 18:47:57 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 05 18:47:57 2015 +0000
tree 8ed8a8896f4ab3d5eaa33e570799ffe94787a133
parent 11215b4db0e92556f82ed72e62b7a2e95925f656
parent 5a81fdc81614098e07599fad76742ec4f5715f4a

Merge "HH: Minimally refactor Android.mk"

camera/QCamera2/HAL3/Android.mk

diff --git a/camera/QCamera2/HAL3/Android.mk b/camera/QCamera2/HAL3/Android.mk
index 1688267..8611e94 100644
--- a/camera/QCamera2/HAL3/Android.mk
+++ b/camera/QCamera2/HAL3/Android.mk
@@ -2,10 +2,6 @@
 
 include $(CLEAR_VARS)
 
-# QCamera3Factory.cpp has unused parameters.
-# QCamera3Channel.cpp compares array 'str' to a null pointer.
-LOCAL_CLANG_CFLAGS += -Wno-unused-parameter -Wno-tautological-pointer-compare
-
 LOCAL_SRC_FILES := \
         QCamera3Factory.cpp \
         QCamera3Hal.cpp \
@@ -21,6 +17,11 @@
 LOCAL_CFLAGS := -Wall -Werror
 LOCAL_CFLAGS += -DHAS_MULTIMEDIA_HINTS
 
+# QCamera3Factory.cpp has unused parameters.
+LOCAL_CFLAGS += -Wno-unused-parameter
+# QCamera3Channel.cpp compares array 'str' to a null pointer.
+LOCAL_CLANG_CFLAGS += -Wno-tautological-pointer-compare
+
 LOCAL_C_INCLUDES := \
         $(LOCAL_PATH)/../stack/common \
         frameworks/native/include/media/openmax \