diff options
| author | Qiming Shi <qiming.shi@intel.com> | 2014-08-18 12:38:14 +0800 |
|---|---|---|
| committer | Xiang, Haihao <haihao.xiang@intel.com> | 2014-09-09 00:59:33 +0800 |
| commit | fc2a19807ad63bf7c374c790a655e285d37a7883 (patch) | |
| tree | 54b6ecc7ccf488f7e79b3be89e982db7c89834cc | |
| parent | 21ce5107db67827b265cc9241a8247df2c137055 (diff) | |
| download | libva-fc2a19807ad63bf7c374c790a655e285d37a7883.tar.gz | |
Enable 64bit build for Android, compatible with 32bit.
Refined the Android.mk to compatible with both 32 and 64 bit android
build.
Signed-off-by: Tinghong Li <tinghong.li@intel.com>
Signed-off-by: Qiming Shi <qiming.shi@intel.com>
(cherry picked from commit 03de01dce6f2b88b9c5ee54705aeebe17c6c5919)
| -rwxr-xr-x | va/Android.mk | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/va/Android.mk b/va/Android.mk index eac34eb..6f2dfb7 100755 --- a/va/Android.mk +++ b/va/Android.mk @@ -25,7 +25,8 @@ LOCAL_PATH:= $(call my-dir) -LIBVA_DRIVERS_PATH = /system/lib +LIBVA_DRIVERS_PATH_32 = /system/lib +LIBVA_DRIVERS_PATH_64 = /system/lib64 # Version set to Android Jelly Bean ALOG_VERSION_REQ := 4.1 @@ -42,9 +43,14 @@ LOCAL_SRC_FILES := \ va_trace.c \ va_fool.c -LOCAL_CFLAGS += \ +LOCAL_CFLAGS_32 += \ + -DANDROID \ + -DVA_DRIVERS_PATH="\"$(LIBVA_DRIVERS_PATH_32)\"" \ + -DLOG_TAG=\"libva\" + +LOCAL_CFLAGS_64 += \ -DANDROID \ - -DVA_DRIVERS_PATH="\"$(LIBVA_DRIVERS_PATH)\"" \ + -DVA_DRIVERS_PATH="\"$(LIBVA_DRIVERS_PATH_64)\"" \ -DLOG_TAG=\"libva\" # Android Jelly Bean defined ALOGx, older versions use LOGx |