From 68478ce3e332bcb008c55f793adb11b88f63ad03 Mon Sep 17 00:00:00 2001
From: Shukla Mradul <mradul_shukla@codeaurora.org>
Date: Sat, 21 May 2016 14:32:30 +0530
Subject: msm8996-common: QCamera2:HAL : HAL1 Removal during Compile time

Issue:
Compile time HAL1 Removal as for IOT projects we are going to use only HAL3 so
removing HAL1 Camera files from compile time.

fix:
Modified the Android.mk file to remove HAL1 during compilation.In
case if HAL1 is not getting compiled muxer object is also not created
in QCamera2Factory.

CRs-Fixed: 1021955
Change-Id: I17af448d7c423c73c5f3c29e95fb42cc69ca5944
Signed-off-by: Davide Garberi <dade.garberi@gmail.com>
---
 camera/QCamera2/util/QCameraFlash.h  | 2 +-
 camera/QCamera2/util/QCameraPerf.cpp | 2 +-
 camera/QCamera2/util/QCameraPerf.h   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'camera/QCamera2/util')

diff --git a/camera/QCamera2/util/QCameraFlash.h b/camera/QCamera2/util/QCameraFlash.h
index fa5e3ea..ede685b 100644
--- a/camera/QCamera2/util/QCameraFlash.h
+++ b/camera/QCamera2/util/QCameraFlash.h
@@ -31,7 +31,7 @@
 #define __QCAMERA_FLASH_H__
 
 // Camera dependencies
-#include "camera_common.h"
+#include "hardware/camera_common.h"
 
 extern "C" {
 #include "mm_camera_interface.h"
diff --git a/camera/QCamera2/util/QCameraPerf.cpp b/camera/QCamera2/util/QCameraPerf.cpp
index 83ba4cc..e143f0f 100644
--- a/camera/QCamera2/util/QCameraPerf.cpp
+++ b/camera/QCamera2/util/QCameraPerf.cpp
@@ -35,7 +35,7 @@
 // System dependencies
 #include <stdlib.h>
 #include <dlfcn.h>
-
+#include <utils/Timers.h>
 // Camera dependencies
 #include "QCameraPerf.h"
 #include "QCameraTrace.h"
diff --git a/camera/QCamera2/util/QCameraPerf.h b/camera/QCamera2/util/QCameraPerf.h
index 0096139..aa3e6be 100644
--- a/camera/QCamera2/util/QCameraPerf.h
+++ b/camera/QCamera2/util/QCameraPerf.h
@@ -35,7 +35,7 @@
 #include <utils/Mutex.h>
 
 // Camera dependencies
-#include "power.h"
+#include "hardware/power.h"
 
 typedef enum {
     ALL_CORES_ONLINE = 0x7FE,
-- 
cgit v1.2.3