diff options
| author | Miao Wang <miaowang@google.com> | 2015-09-21 10:58:38 -0700 |
|---|---|---|
| committer | Miao Wang <miaowang@google.com> | 2015-09-21 14:07:51 -0700 |
| commit | cddf54f216214f34ebae08229c51acacec399810 (patch) | |
| tree | c833cb45a1f77591e78d2af2a89bd73d22b394f5 | |
| parent | 0a70f98b4be89f51cdd54bf739c953e82ec7fb55 (diff) | |
| download | gemmlowp-cddf54f216214f34ebae08229c51acacec399810.tar.gz | |
Automatically configure the headers based on the SDK version.
Change-Id: Ic576ecd28bf1feae7b2bc8afb944e132a2301a1b
| -rw-r--r-- | eight_bit_int_gemm/Android.mk | 2 | ||||
| -rw-r--r-- | eight_bit_int_gemm/eight_bit_int_gemm.h | 7 | ||||
| -rw-r--r-- | profiling/instrumentation.h | 7 |
3 files changed, 14 insertions, 2 deletions
diff --git a/eight_bit_int_gemm/Android.mk b/eight_bit_int_gemm/Android.mk index bca39c5..51b1c8f 100644 --- a/eight_bit_int_gemm/Android.mk +++ b/eight_bit_int_gemm/Android.mk @@ -34,9 +34,7 @@ LOCAL_SDK_VERSION := 8 LOCAL_CPP_EXTENSION := .cc LOCAL_SRC_FILES:= eight_bit_int_gemm.cc - LOCAL_CFLAGS += -no-integrated-as -std=c++11 -LOCAL_CFLAGS += -DGEMMLOWP_USE_OLD_ANDROID_SDK LOCAL_C_INCLUDES += external/gemmlowp/ LOCAL_NDK_STL_VARIANT := stlport_static diff --git a/eight_bit_int_gemm/eight_bit_int_gemm.h b/eight_bit_int_gemm/eight_bit_int_gemm.h index 37586bd..8929ae5 100644 --- a/eight_bit_int_gemm/eight_bit_int_gemm.h +++ b/eight_bit_int_gemm/eight_bit_int_gemm.h @@ -17,6 +17,13 @@ #ifndef GEMMLOWP_EIGHT_BIT_INT_GEMM_EIGHT_BIT_INT_GEMM_H_ #define GEMMLOWP_EIGHT_BIT_INT_GEMM_EIGHT_BIT_INT_GEMM_H_ +#if defined ANDROID || defined __ANDROID__ +#include <android/api-level.h> +#if __ANDROID_API__ < 22 +#define GEMMLOWP_USE_OLD_ANDROID_SDK +#endif +#endif + #ifndef GEMMLOWP_USE_OLD_ANDROID_SDK #include <cstdint> #else diff --git a/profiling/instrumentation.h b/profiling/instrumentation.h index a443f96..2fbcda8 100644 --- a/profiling/instrumentation.h +++ b/profiling/instrumentation.h @@ -27,6 +27,13 @@ #include <pthread.h> #include <cstdio> +#if defined ANDROID || defined __ANDROID__ +#include <android/api-level.h> +#if __ANDROID_API__ < 22 +#define GEMMLOWP_USE_OLD_ANDROID_SDK +#endif +#endif + #ifndef GEMMLOWP_USE_OLD_ANDROID_SDK #include <cstdint> #else |