msm8996-common: qcom-camera: Completed FR49059 and FR49058

FR49059: Accessing AOSP/Google projects Headers

Description: Vendor modules cannot refer AOSP header
paths with absolute or Global Paths instead add
corresponding header library

FR49058 :  VNDK compliance

Description : VNDK is set of AOSP libraries which
are exposed to vendor (partition) for development.

Example :

error: vendor lib "/vendor/lib/libeffects.so"
 depends on non-eligible lib
 "/system/lib/libeffectsconfig.so".
Here , QCOM vendor-partition Library
using lib outside VNDK from system.

CRs-Fixed: 2217547

Change-Id: I51a88145fccba592080d6287ae7ff14d12c65296

9 files changed, 9 insertions, 9 deletions

diff --git a/camera/QCamera2/HAL/QCamera2HWI.cpp b/camera/QCamera2/HAL/QCamera2HWI.cpp
index 7066805..e1cd590 100644
--- a/camera/QCamera2/HAL/QCamera2HWI.cpp
+++ b/camera/QCamera2/HAL/QCamera2HWI.cpp
@@ -38,7 +38,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "gralloc_priv.h"
-#include "native_handle.h"
+#include "cutils/native_handle.h"
 
 // Camera definitions
 #include "android/QCamera2External.h"
diff --git a/camera/QCamera2/HAL/QCamera2HWI.h b/camera/QCamera2/HAL/QCamera2HWI.h
index 0c1a00a..e0cdc3d 100644
--- a/camera/QCamera2/HAL/QCamera2HWI.h
+++ b/camera/QCamera2/HAL/QCamera2HWI.h
@@ -35,7 +35,7 @@
 #include <utils/Condition.h>
 
 // Camera dependencies
-#include "camera.h"
+#include "hardware/camera.h"
 #include "QCameraAllocator.h"
 #include "QCameraChannel.h"
 #include "QCameraCmdThread.h"
diff --git a/camera/QCamera2/HAL/QCameraChannel.h b/camera/QCamera2/HAL/QCameraChannel.h
index 1db634d..695ddbd 100644
--- a/camera/QCamera2/HAL/QCameraChannel.h
+++ b/camera/QCamera2/HAL/QCameraChannel.h
@@ -30,7 +30,7 @@
 #ifndef __QCAMERA_CHANNEL_H__
 #define __QCAMERA_CHANNEL_H__
 
-#include "camera.h"
+#include "hardware/camera.h"
 #include "QCameraMem.h"
 #include "QCameraParameters.h"
 #include "QCameraStream.h"
diff --git a/camera/QCamera2/HAL/QCameraMem.cpp b/camera/QCamera2/HAL/QCameraMem.cpp
index 2502cf3..6fc269e 100755
--- a/camera/QCamera2/HAL/QCameraMem.cpp
+++ b/camera/QCamera2/HAL/QCameraMem.cpp
@@ -34,7 +34,7 @@
 #include <utils/Errors.h>
 #define MMAN_H <SYSTEM_HEADER_PREFIX/mman.h>
 #include MMAN_H
-#include "gralloc.h"
+#include "hardware/gralloc.h"
 #include "gralloc_priv.h"
 
 // Camera dependencies
diff --git a/camera/QCamera2/HAL/QCameraMem.h b/camera/QCamera2/HAL/QCameraMem.h
index ec75e51..62eff55 100644
--- a/camera/QCamera2/HAL/QCameraMem.h
+++ b/camera/QCamera2/HAL/QCameraMem.h
@@ -39,7 +39,7 @@
 #include "qdMetaData.h"
 
 // Camera dependencies
-#include "camera.h"
+#include "hardware/camera.h"
 
 extern "C" {
 #include "mm_camera_interface.h"
diff --git a/camera/QCamera2/HAL/QCameraMuxer.h b/camera/QCamera2/HAL/QCameraMuxer.h
index a85612e..da411c8 100644
--- a/camera/QCamera2/HAL/QCameraMuxer.h
+++ b/camera/QCamera2/HAL/QCameraMuxer.h
@@ -29,7 +29,7 @@
 #ifndef __QCAMERAMUXER_H__
 #define __QCAMERAMUXER_H__
 
-#include "camera.h"
+#include "hardware/camera.h"
 #include "QCamera2HWI.h"
 #include "QCamera3HWI.h"
 
diff --git a/camera/QCamera2/HAL/QCameraParameters.cpp b/camera/QCamera2/HAL/QCameraParameters.cpp
index cefca23..5fa5eab 100644
--- a/camera/QCamera2/HAL/QCameraParameters.cpp
+++ b/camera/QCamera2/HAL/QCameraParameters.cpp
@@ -40,7 +40,7 @@
 #define SYSINFO_H <SYSTEM_HEADER_PREFIX/sysinfo.h>
 #include SYSINFO_H
 #include "gralloc_priv.h"
-#include "graphics.h"
+#include "system/graphics.h"
 
 // Camera dependencies
 #include "QCameraBufferMaps.h"
diff --git a/camera/QCamera2/HAL/QCameraParameters.h b/camera/QCamera2/HAL/QCameraParameters.h
index ee00117..3c9bac7 100644
--- a/camera/QCamera2/HAL/QCameraParameters.h
+++ b/camera/QCamera2/HAL/QCameraParameters.h
@@ -28,7 +28,7 @@
 #include <utils/Errors.h>
 
 // Camera dependencies
-#include "camera.h"
+#include "hardware/camera.h"
 #include "QCameraMem.h"
 #include "QCameraParametersIntf.h"
 #include "QCameraThermalAdapter.h"
diff --git a/camera/QCamera2/HAL/QCameraStream.h b/camera/QCamera2/HAL/QCameraStream.h
index fc5c443..ea39539 100644
--- a/camera/QCamera2/HAL/QCameraStream.h
+++ b/camera/QCamera2/HAL/QCameraStream.h
@@ -31,7 +31,7 @@
 #define __QCAMERA_STREAM_H__
 
 // Camera dependencies
-#include "camera.h"
+#include "hardware/camera.h"
 #include "QCameraCmdThread.h"
 #include "QCameraMem.h"
 #include "QCameraAllocator.h"