author | junliang.zhou <junliang.zhou@amlogic.com> | 2014-10-30 11:17:31 (GMT) |
---|---|---|
committer | jiyu.yang <jiyu.yang@amlogic.com> | 2014-10-30 11:17:31 (GMT) |
commit | 6dfff5d2dcdbfdd76f1171b18ec0defbdeac0945 (patch) | |
tree | 68f261e362d08c5051c0cfbc427df20e21621062 | |
parent | 0643940b60a4961b4ec4553b1ad71ae18ffd4abb (diff) | |
download | screen_source-6dfff5d2dcdbfdd76f1171b18ec0defbdeac0945.zip screen_source-6dfff5d2dcdbfdd76f1171b18ec0defbdeac0945.tar.gz screen_source-6dfff5d2dcdbfdd76f1171b18ec0defbdeac0945.tar.bz2 |
fixed Android L compile error
-rwxr-xr-x | Android.mk | 3 | ||||
-rwxr-xr-x | aml_screen.cpp | 2 | ||||
-rwxr-xr-x | v4l2_vdin.cpp | 2 | ||||
-rwxr-xr-x | v4l2_vdin.h | 4 |
4 files changed, 7 insertions, 4 deletions
@@ -18,6 +18,9 @@ endif LOCAL_C_INCLUDES += frameworks/native/include/utils \ frameworks/native/include/android \ + system/core/include/utils \ + system/core/libion/include \ + system/core/libion/kernel-headers \ $(GRALLOC_DIR) LOCAL_SHARED_LIBRARIES:= libutils liblog libui diff --git a/aml_screen.cpp b/aml_screen.cpp index 48acbd6..0ed2cec 100755 --- a/aml_screen.cpp +++ b/aml_screen.cpp @@ -29,7 +29,7 @@ #include <sys/ioctl.h> #include <sys/mman.h> #include <sys/select.h> -#include <linux/videodev.h> +#include <linux/videodev2.h> #include <sys/time.h> diff --git a/v4l2_vdin.cpp b/v4l2_vdin.cpp index fade940..ecb52ed 100755 --- a/v4l2_vdin.cpp +++ b/v4l2_vdin.cpp @@ -31,7 +31,7 @@ #include <sys/ioctl.h> #include <sys/mman.h> #include <sys/select.h> -#include <linux/videodev.h> +#include <linux/videodev2.h> #include <sys/time.h> #include <cutils/properties.h> diff --git a/v4l2_vdin.h b/v4l2_vdin.h index 04dd34f..61d9f37 100755 --- a/v4l2_vdin.h +++ b/v4l2_vdin.h @@ -23,7 +23,7 @@ #include <sys/ioctl.h> #include <sys/mman.h> #include <sys/select.h> -#include <linux/videodev.h> +#include <linux/videodev2.h> #include <sys/time.h> #include <utils/KeyedVector.h> @@ -135,4 +135,4 @@ class vdin_screen_source { void *mUser; }; -}
\ No newline at end of file +} |