Make RS compile on ARM64.
bug 13280327
Change-Id: I79080c448ca17d0cba8df075737c22b24ce9a085
diff --git a/Android.mk b/Android.mk
index 12d5804..d2caac6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -13,7 +13,7 @@
include $(CLEAR_VARS)
LOCAL_CLANG := true
LOCAL_MODULE := libRSDriver
-LOCAL_MODULE_TARGET_ARCH_WARN := arm mips x86 x86_64
+LOCAL_MODULE_TARGET_ARCH_WARN := arm mips x86 x86_64 arm64
LOCAL_SRC_FILES:= \
driver/rsdAllocation.cpp \
@@ -38,13 +38,18 @@
LOCAL_SHARED_LIBRARIES += libRS libRSCpuRef
LOCAL_SHARED_LIBRARIES += liblog libcutils libutils libEGL libGLESv1_CM libGLESv2
-LOCAL_SHARED_LIBRARIES += libbcc libbcinfo libLLVM libui libgui libsync
+LOCAL_SHARED_LIBRARIES += libui libgui libsync
+
+# FIXME for 64-bit
+LOCAL_SHARED_LIBRARIES_32 += libbcc libbcinfo libLLVM
LOCAL_C_INCLUDES += frameworks/compile/libbcc/include
LOCAL_C_INCLUDES += frameworks/rs/cpu_ref/linkloader/include
LOCAL_CFLAGS += $(rs_base_CFLAGS)
+LOCAL_CFLAGS_64 += -DFAKE_ARM64_BUILD=1
+
LOCAL_LDLIBS := -lpthread -ldl
LOCAL_MODULE_TAGS := optional
@@ -74,7 +79,7 @@
include $(CLEAR_VARS)
LOCAL_CLANG := true
LOCAL_MODULE := libRS
-LOCAL_MODULE_TARGET_ARCH_WARN := arm mips x86 x86_64
+LOCAL_MODULE_TARGET_ARCH_WARN := arm mips x86 x86_64 arm64
LOCAL_MODULE_CLASS := SHARED_LIBRARIES
generated_sources:= $(local-generated-sources-dir)
@@ -152,15 +157,22 @@
rsThreadIO.cpp \
rsType.cpp
-LOCAL_SHARED_LIBRARIES += liblog libcutils libutils libEGL libGLESv1_CM libGLESv2 libbcc
-LOCAL_SHARED_LIBRARIES += libui libbcinfo libLLVM libgui libsync libdl
+LOCAL_SHARED_LIBRARIES += liblog libcutils libutils libEGL libGLESv1_CM libGLESv2
+LOCAL_SHARED_LIBRARIES += libgui libsync libdl libui
LOCAL_SHARED_LIBRARIES += libft2 libpng libz
+# FIXME for 64-bit
+LOCAL_SHARED_LIBRARIES_32 += libbcc libbcinfo libLLVM
+
+
LOCAL_C_INCLUDES += external/freetype/include
LOCAL_C_INCLUDES += frameworks/compile/libbcc/include
LOCAL_CFLAGS += $(rs_base_CFLAGS)
+# FIXME for 64-bit
+LOCAL_CFLAGS_64 += -DFAKE_ARM64_BUILD=1
+
LOCAL_LDLIBS := -lpthread -ldl
LOCAL_MODULE_TAGS := optional
@@ -249,7 +261,6 @@
include $(BUILD_HOST_STATIC_LIBRARY)
-
LLVM_ROOT_PATH := external/llvm
#=============================================================================
@@ -271,6 +282,7 @@
include $(CLEAR_VARS)
+
LOCAL_MODULE := librsloader
LOCAL_MODULE_TAGS := optional
@@ -289,7 +301,6 @@
include $(LLVM_ROOT_PATH)/llvm-device-build.mk
include $(BUILD_STATIC_LIBRARY)
-
#=============================================================================
# android librsloader for libbcc (Host)
#-----------------------------------------------------------------------------
@@ -320,3 +331,4 @@
include $(BUILD_HOST_STATIC_LIBRARY)
include $(call all-makefiles-under,$(LOCAL_PATH))
+