| author | Jiyu Yang <jiyu.yang@amlogic.com> | 2015-02-10 10:53:48 (GMT) |
|---|---|---|
| committer | Jiyu Yang <jiyu.yang@amlogic.com> | 2015-02-10 12:06:01 (GMT) |
| commit | 9d3fc6b554120dbb5b82358e8e4f2337bfc1f909 (patch) | |
| tree | aeb320ec4f2996afbab58a6fceb5a6251d0ebc9e | |
| parent | 913a86dc1a234ce60c87a2cd285f790de9e7aa3f (diff) | |
| download | camera-9d3fc6b554120dbb5b82358e8e4f2337bfc1f909.zip camera-9d3fc6b554120dbb5b82358e8e4f2337bfc1f909.tar.gz camera-9d3fc6b554120dbb5b82358e8e4f2337bfc1f909.tar.bz2 | |
correct gralloc header file
Change-Id: I628306b88d17879679b383f6d372c9af82ec986f
Signed-off-by: Jiyu Yang <jiyu.yang@amlogic.com>
| -rwxr-xr-x | v3/Android.mk | 69 | ||||
| -rw-r--r-- | v3/EmulatedFakeCamera2.cpp | 2 | ||||
| -rwxr-xr-x | v3/EmulatedFakeCamera3.cpp | 2 |
3 files changed, 36 insertions, 37 deletions
diff --git a/v3/Android.mk b/v3/Android.mk index ffb0c91..c6ddc9a 100755 --- a/v3/Android.mk +++ b/v3/Android.mk @@ -59,50 +59,49 @@ LOCAL_SHARED_LIBRARIES:= \ # JPEG conversion libraries and includes. LOCAL_SHARED_LIBRARIES += \ - libjpeg \ - libcamera_metadata + libjpeg \ + libcamera_metadata LOCAL_STATIC_LIBRARIES := \ libyuv_static \ LOCAL_C_INCLUDES += external/jpeg \ - external/jhead/ \ - frameworks/native/include/media/hardware \ - external/libyuv/files/include/ \ - $(LOCAL_PATH)/../opengl/system/OpenglSystemCommon \ - $(TOP)/system/core/libion/include \ - $(TOP)/system/core/libion/kernel-headers \ - $(LOCAL_PATH)/inc \ - $(LOCAL_PATH)/hardware/amlogic/gralloc \ - $(call include-path-for, camera) + external/jhead/ \ + frameworks/native/include/media/hardware \ + external/libyuv/files/include/ \ + $(TOP)/system/core/libion/include \ + $(TOP)/system/core/libion/kernel-headers \ + $(TOP)/hardware/amlogic/gralloc \ + $(LOCAL_PATH)/inc \ + $(call include-path-for, camera) LOCAL_SRC_FILES := \ - EmulatedCameraHal.cpp \ - EmulatedCameraFactory.cpp \ - EmulatedCameraHotplugThread.cpp \ - EmulatedBaseCamera.cpp \ - EmulatedCamera.cpp \ - EmulatedCameraDevice.cpp \ - EmulatedQemuCamera.cpp \ - EmulatedQemuCameraDevice.cpp \ - EmulatedFakeCamera.cpp \ - EmulatedFakeCameraDevice.cpp \ - Converters.cpp \ - PreviewWindow.cpp \ - CallbackNotifier.cpp \ - QemuClient.cpp \ - JpegCompressor.cpp \ - fake-pipeline2/Scene.cpp \ - fake-pipeline2/Sensor.cpp \ - fake-pipeline2/ge2d_stream.cpp \ - fake-pipeline2/JpegCompressor.cpp \ + EmulatedCameraHal.cpp \ + EmulatedCameraFactory.cpp \ + EmulatedCameraHotplugThread.cpp \ + EmulatedBaseCamera.cpp \ + EmulatedCamera.cpp \ + EmulatedCameraDevice.cpp \ + EmulatedQemuCamera.cpp \ + EmulatedQemuCameraDevice.cpp \ + EmulatedFakeCamera.cpp \ + EmulatedFakeCameraDevice.cpp \ + Converters.cpp \ + PreviewWindow.cpp \ + CallbackNotifier.cpp \ + QemuClient.cpp \ + JpegCompressor.cpp \ + fake-pipeline2/Scene.cpp \ + fake-pipeline2/Sensor.cpp \ + fake-pipeline2/ge2d_stream.cpp \ + fake-pipeline2/JpegCompressor.cpp \ fake-pipeline2/NV12_resize.c \ fake-pipeline2/util.c \ - EmulatedCamera3.cpp \ - EmulatedFakeCamera3.cpp \ - EmulatedFakeCamera3Info.cpp \ - fake-pipeline2/camera_hw.cpp \ - VendorTags.cpp \ + EmulatedCamera3.cpp \ + EmulatedFakeCamera3.cpp \ + EmulatedFakeCamera3Info.cpp \ + fake-pipeline2/camera_hw.cpp \ + VendorTags.cpp ifeq ($(TARGET_PRODUCT),vbox_x86) LOCAL_MODULE := camera.vbox_x86 diff --git a/v3/EmulatedFakeCamera2.cpp b/v3/EmulatedFakeCamera2.cpp index 4d8edfb..9a061ab 100644 --- a/v3/EmulatedFakeCamera2.cpp +++ b/v3/EmulatedFakeCamera2.cpp @@ -29,7 +29,7 @@ #include "EmulatedCameraFactory.h" #include <ui/Rect.h> #include <ui/GraphicBufferMapper.h> -#include "../../gralloc/gralloc_priv.h" +#include <gralloc_priv.h> #define ERROR_CAMERA_NOT_PRESENT -EPIPE diff --git a/v3/EmulatedFakeCamera3.cpp b/v3/EmulatedFakeCamera3.cpp index 060f6f0..6417fe4 100755 --- a/v3/EmulatedFakeCamera3.cpp +++ b/v3/EmulatedFakeCamera3.cpp @@ -37,7 +37,7 @@ #include "fake-pipeline2/Sensor.h" #include "fake-pipeline2/JpegCompressor.h" #include <cmath> -#include "../../gralloc/gralloc_priv.h" +#include <gralloc_priv.h> #if defined(LOG_NNDEBUG) && LOG_NNDEBUG == 0 #define ALOGVV ALOGV |