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)

diff --git a/va/Android.mk b/va/Android.mk
index eac34eb..6f2dfb7 100755 (executable)
--- 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