commit df9c334a6bf78c966d71fde58c72aa08f87e8547
author Thierry Strudel <tstrudel@google.com> Mon Sep 19 08:47:29 2016 -0700
committer Thierry Strudel <tstrudel@google.com> Mon Sep 19 08:47:34 2016 -0700
tree 8ded716ba74ce5b0bd90c53c27b76ef011aba1c5
parent 34084905528db92f401cd0226aafa33798daf028

msmcobalt: fix unused variable build error

Bug: 31420007
Change-Id: I7cc95ed2a4eb527f5dab27a8219862ec06487ae2

msmcobalt/QCamera2/Android.mk

diff --git a/msmcobalt/QCamera2/Android.mk b/msmcobalt/QCamera2/Android.mk
index 2ea388b..d65133e 100644
--- a/msmcobalt/QCamera2/Android.mk
+++ b/msmcobalt/QCamera2/Android.mk
@@ -110,6 +110,7 @@
 
 #LOCAL_STATIC_LIBRARIES := libqcamera2_util
 LOCAL_C_INCLUDES += \
+        $(TARGET_OUT_HEADERS)/mm-core/omxcore \
         $(TARGET_OUT_HEADERS)/qcom/display
 LOCAL_C_INCLUDES += \
         hardware/qcom/display/libqservice

msmcobalt/QCamera2/HAL/QCameraMem.cpp

diff --git a/msmcobalt/QCamera2/HAL/QCameraMem.cpp b/msmcobalt/QCamera2/HAL/QCameraMem.cpp
index 2e2a3a3..0c599cf 100755
--- a/msmcobalt/QCamera2/HAL/QCameraMem.cpp
+++ b/msmcobalt/QCamera2/HAL/QCameraMem.cpp
@@ -1601,9 +1601,9 @@
 int QCameraVideoMemory::closeNativeHandle(const void *data, bool metadata)
 {
     int32_t rc = NO_ERROR;
+#ifdef USE_MEDIA_EXTENSIONS
     int32_t index = -1;
 
-#ifdef USE_MEDIA_EXTENSIONS
     camera_memory_t *video_mem = NULL;
 
     if (metadata) {
@@ -1630,6 +1630,9 @@
     } else {
         LOGW("Warning: Not of type video meta buffer");
     }
+#else
+    (void) data;
+    (void) metadata;
 #endif
     return rc;
 }