From 2ba0b76b77e9888f4713e9d001339ee2135e6165 Mon Sep 17 00:00:00 2001 From: Sen Jiang Date: Fri, 1 Apr 2016 14:22:54 -0700 Subject: Build libdivsufsort for the target. Also changed it to a static library. Test: mma Bug: 26955860 Change-Id: Ia0d0c297aaf7f7a2a0a52616a9ade4cd43b64e36 --- Android.mk | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/Android.mk b/Android.mk index 13ddaaf..97277a2 100644 --- a/Android.mk +++ b/Android.mk @@ -34,16 +34,16 @@ libdivsufsort_cflags := \ -Wextra \ -DHAVE_CONFIG_H=1 -# libdivsufsort using 32-bit integers for the suffix array (host shared lib) +# libdivsufsort using 32-bit integers for the suffix array (host static lib) include $(CLEAR_VARS) LOCAL_MODULE := libdivsufsort LOCAL_SRC_FILES := $(libdivsufsort_src_files) LOCAL_C_INCLUDES := $(libdivsufsort_c_includes) LOCAL_EXPORT_C_INCLUDE_DIRS := $(libdivsufsort_export_c_include_dirs) LOCAL_CFLAGS := $(libdivsufsort_cflags) -include $(BUILD_HOST_SHARED_LIBRARY) +include $(BUILD_HOST_STATIC_LIBRARY) -# libdivsufsort using 64-bit integers for the suffix array (host shared lib) +# libdivsufsort using 64-bit integers for the suffix array (host static lib) include $(CLEAR_VARS) LOCAL_MODULE := libdivsufsort64 LOCAL_SRC_FILES := $(libdivsufsort_src_files) @@ -52,4 +52,24 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := $(libdivsufsort_export_c_include_dirs) LOCAL_CFLAGS := \ $(libdivsufsort_cflags) \ -DBUILD_DIVSUFSORT64 -include $(BUILD_HOST_SHARED_LIBRARY) +include $(BUILD_HOST_STATIC_LIBRARY) + +# libdivsufsort using 32-bit integers for the suffix array (target static lib) +include $(CLEAR_VARS) +LOCAL_MODULE := libdivsufsort +LOCAL_SRC_FILES := $(libdivsufsort_src_files) +LOCAL_C_INCLUDES := $(libdivsufsort_c_includes) +LOCAL_EXPORT_C_INCLUDE_DIRS := $(libdivsufsort_export_c_include_dirs) +LOCAL_CFLAGS := $(libdivsufsort_cflags) +include $(BUILD_STATIC_LIBRARY) + +# libdivsufsort using 64-bit integers for the suffix array (target static lib) +include $(CLEAR_VARS) +LOCAL_MODULE := libdivsufsort64 +LOCAL_SRC_FILES := $(libdivsufsort_src_files) +LOCAL_C_INCLUDES := $(libdivsufsort_c_includes) +LOCAL_EXPORT_C_INCLUDE_DIRS := $(libdivsufsort_export_c_include_dirs) +LOCAL_CFLAGS := \ + $(libdivsufsort_cflags) \ + -DBUILD_DIVSUFSORT64 +include $(BUILD_STATIC_LIBRARY) -- cgit v1.2.3