diff options
| author | Thierry Strudel <thierry.strudel@intel.com> | 2014-11-10 12:16:16 -0800 |
|---|---|---|
| committer | Patrick Tjin <pattjin@google.com> | 2014-11-19 15:14:32 -0800 |
| commit | d6df468b85215fbafccfd947e609d8724ec51d70 (patch) | |
| tree | 3495da6dc6515429b9ed3ee1629d9794f9bbe0a0 /va | |
| parent | a11b959f9fe7476b4da95fbaf34105e33cfeb0d6 (diff) | |
| download | libva-d6df468b85215fbafccfd947e609d8724ec51d70.tar.gz | |
va: use system headers instead of framework ones
cleanup needed framework libs in tests
Bug: 18313857
Change-Id: Ic4ef045cc11e93e5e0bb0876a863b67abcbe79a3
Signed-off-by: Thierry Strudel <thierry.strudel@intel.com>
Diffstat (limited to 'va')
| -rwxr-xr-x | va/Android.mk | 19 | ||||
| -rw-r--r-- | va/va_android.h | 3 |
2 files changed, 4 insertions, 18 deletions
diff --git a/va/Android.mk b/va/Android.mk index 4e85217..eae7993 100755 --- a/va/Android.mk +++ b/va/Android.mk @@ -28,17 +28,8 @@ LOCAL_PATH:= $(call my-dir) ifeq ($(ENABLE_IMG_GRAPHICS),true) LIBVA_DRIVERS_PATH = /system/lib - -# Version set to Android Jelly Bean -ALOG_VERSION_REQ := 4.1 -ALOG_VERSION := $(filter $(ALOG_VERSION_REQ),$(firstword $(sort $(PLATFORM_VERSION) \ - $(ALOG_VERSION_REQ)))) - include $(CLEAR_VARS) -#LIBVA_MINOR_VERSION := 31 -#LIBVA_MAJOR_VERSION := 0 - LOCAL_SRC_FILES := \ va.c \ va_trace.c \ @@ -47,14 +38,8 @@ LOCAL_SRC_FILES := \ LOCAL_CFLAGS := \ -DANDROID \ -DVA_DRIVERS_PATH="\"$(LIBVA_DRIVERS_PATH)\"" \ - -DLOG_TAG=\"libva\" - -# Android Jelly Bean defined ALOGx, older versions use LOGx -ifeq ($(ALOG_VERSION), $(ALOG_VERSION_REQ)) -LOCAL_CFLAGS += -DANDROID_ALOG -else -LOCAL_CFLAGS += -DANDROID_LOG -endif + -DLOG_TAG=\"libva\" \ + -DANDROID_ALOG LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/.. diff --git a/va/va_android.h b/va/va_android.h index 0193fb0..978becd 100644 --- a/va/va_android.h +++ b/va/va_android.h @@ -48,7 +48,8 @@ VADisplay vaGetDisplay ( #ifdef __cplusplus #ifdef ANDROID -#include <gui/Surface.h> +#include <system/window.h> +#include <utils/StrongPointer.h> using namespace android; /* |