Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_fram…

…eworks_av into local
Schischu · Jul 25, 2015 · 6ebfe85 · 6ebfe85
2 parents 92fb9d3 + 289d8a8
commit 6ebfe85
Show file tree

Hide file tree

Showing 46 changed files with 1,839 additions and 24 deletions.
diff --git a/camera/Android.mk b/camera/Android.mk
@@ -23,6 +23,11 @@ LOCAL_SRC_FILES:= \
 	ProCamera.cpp \
 	CameraBase.cpp \
 
+ifeq ($(BOARD_HAS_MTK_HARDWARE),true)
+	LOCAL_SRC_FILES+= \
+		MtkCameraParameters.cpp
+endif
+
 LOCAL_SHARED_LIBRARIES := \
 	libcutils \
 	libutils \

diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <camera/CameraParameters.h>
-#include <camera/CameraParametersExtra.h>
+#include "camera/CameraParametersExtra.h"
 
 namespace android {
 // Parameter keys to communicate between camera application and driver.

diff --git a/camera/MtkCameraParameters.cpp b/camera/MtkCameraParameters.cpp
diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h
@@ -19,7 +19,7 @@
 
 #include <utils/KeyedVector.h>
 #include <utils/String8.h>
-#include <camera/CameraParametersExtra.h>
+#include "camera/CameraParametersExtra.h"
 
 namespace android {