fix compile error on jellybean

9 files changed, 34 insertions, 10 deletions

diff --git a/Android.mk b/Android.mk
index 791a159..ce61a09 100755
--- a/Android.mk
+++ b/Android.mk
@@ -44,12 +44,14 @@ LOCAL_C_INCLUDES += \
     $(LOCAL_PATH)/inc/ \
     $(LOCAL_PATH)/utils \
     $(LOCAL_PATH)/inc/V4LCameraAdapter \
-    frameworks/base/include/ui \
-    frameworks/base/include/utils \
+    frameworks/native/include/ui \
+    frameworks/native/include/utils \
     frameworks/base/include/media/stagefright \
     external/jhead/ \
     external/jpeg/ \
-    hardware/libhardware/modules/gralloc/
+    hardware/libhardware/modules/gralloc/    \
+    frameworks/native/include/media/hardware
+
 
 LOCAL_SHARED_LIBRARIES:= \
     libui \
diff --git a/CameraHal.cpp b/CameraHal.cpp
index 85fd423..0671741 100755
--- a/CameraHal.cpp
+++ b/CameraHal.cpp
@@ -34,7 +34,10 @@
 #include <math.h>
 
 namespace android {
-
+#define LOGD ALOGD
+#define LOGE ALOGE
+#define LOGV ALOGV
+#define LOGI ALOGI
 
 #ifndef FBIOPUT_OSD_SRCCOLORKEY
 #define  FBIOPUT_OSD_SRCCOLORKEY    0x46fb
diff --git a/CameraHal_Module.cpp b/CameraHal_Module.cpp
index 378ceeb..fee9db3 100755
--- a/CameraHal_Module.cpp
+++ b/CameraHal_Module.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-
+#define LOG_NDEBUG 0
 #define LOG_TAG "CameraHAL"
 
 #include <utils/threads.h>
@@ -60,7 +60,10 @@ typedef struct aml_camera_device {
     int cameraid;
 } aml_camera_device_t;
 
-
+#define LOGV ALOGV
+#define LOGD ALOGD
+#define LOGE ALOGE
+#define LOGI ALOGI
 /*******************************************************************
  * implementation of camera_device_ops functions
  *******************************************************************/
diff --git a/CameraProperties.cpp b/CameraProperties.cpp
index b3baaf0..7bb7c24 100755
--- a/CameraProperties.cpp
+++ b/CameraProperties.cpp
@@ -28,6 +28,11 @@
 
 namespace android {
 
+#define LOGD ALOGD
+#define LOGV ALOGV
+#define LOGE ALOGE
+#define LOGI ALOGI
+
 /*********************************************************
  CameraProperties - public function implemetation
 **********************************************************/
diff --git a/Encoder_libjpeg.cpp b/Encoder_libjpeg.cpp
index da2816b..e9107ea 100755
--- a/Encoder_libjpeg.cpp
+++ b/Encoder_libjpeg.cpp
@@ -321,7 +321,7 @@ void ExifElementsTable::insertExifToJpeg(unsigned char* jpeg, size_t jpeg_size)
     ResetJpgfile();
     if (ReadJpegSectionsFromBuffer(jpeg, jpeg_size, read_mode)) {
         jpeg_opened = true;
-        create_EXIF(table, exif_tag_count, gps_tag_count);
+        create_EXIF(table, exif_tag_count, gps_tag_count,true);
     }
 }
 
diff --git a/NV12_resize.c b/NV12_resize.c
index 03c049e..5153ecc 100644
--- a/NV12_resize.c
+++ b/NV12_resize.c
@@ -3,7 +3,10 @@
 //#define LOG_NDEBUG 0
 #define LOG_NIDEBUG 0
 #define LOG_NDDEBUG 0
-
+#define LOGV  ALOGV
+#define LOGE  ALOGE
+#define LOGI  ALOGI
+#define LOD    ALOGD
 #define LOG_TAG "NV12_resize"
 #define STRIDE 4096
 #include <utils/Log.h>
diff --git a/inc/ANativeWindowDisplayAdapter.h b/inc/ANativeWindowDisplayAdapter.h
index 95685ee..ba99f5c 100755
--- a/inc/ANativeWindowDisplayAdapter.h
+++ b/inc/ANativeWindowDisplayAdapter.h
@@ -17,7 +17,7 @@
 

 

 #include "CameraHal.h"

-#include <ui/egl/android_natives.h>

+//#include <ui/egl/android_natives.h>

 #include <ui/GraphicBufferMapper.h>

 

 

diff --git a/inc/CameraHal.h b/inc/CameraHal.h
index 1431ff4..699093c 100755
--- a/inc/CameraHal.h
+++ b/inc/CameraHal.h
@@ -86,6 +86,11 @@
 //Uncomment to enable more verbose/debug logs
 #define DEBUG_LOG
 
+#define LOGE ALOGE
+#define LOGV ALOGV
+#define LOGI ALOGI
+#define LOGD ALOGD
+
 ///Camera HAL Logging Functions
 #ifndef DEBUG_LOG
 
@@ -114,7 +119,6 @@
 
 #endif
 
-
 //#define AMLOGIC_CAMERA_OVERLAY_SUPPORT
 //#define AMLOGIC_USB_CAMERA_SUPPORT
 #ifndef AMLOGIC_USB_CAMERA_SUPPORT
diff --git a/utils/MessageQueue.cpp b/utils/MessageQueue.cpp
index 7fcedce..aad8d80 100755
--- a/utils/MessageQueue.cpp
+++ b/utils/MessageQueue.cpp
@@ -30,6 +30,10 @@
 
 namespace MSGUTILS {
 
+#define LOGD ALOGD
+#define LOGE ALOGE
+#define LOGI ALOGI
+#define LOGV ALOGV
 /**
    @brief Constructor for the message queue class