diff options
| author | Miao Wang <miaowang@google.com> | 2015-09-21 22:07:15 +0000 |
|---|---|---|
| committer | Miao Wang <miaowang@google.com> | 2015-09-21 22:07:15 +0000 |
| commit | 93c433185767be8a7321fa78979de1d4bcbad8dc (patch) | |
| tree | db89190eeca892a613cc996f723863bdaff3e6bd | |
| parent | cddf54f216214f34ebae08229c51acacec399810 (diff) | |
| download | gemmlowp-93c433185767be8a7321fa78979de1d4bcbad8dc.tar.gz | |
Revert "Automatically configure the headers based on the SDK version."
This reverts commit cddf54f216214f34ebae08229c51acacec399810.
Change-Id: Ib28c2e4373ff6ba713790dd3a4ed1cfc3ba215fc
| -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, 2 insertions, 14 deletions
diff --git a/eight_bit_int_gemm/Android.mk b/eight_bit_int_gemm/Android.mk index 51b1c8f..bca39c5 100644 --- a/eight_bit_int_gemm/Android.mk +++ b/eight_bit_int_gemm/Android.mk @@ -34,7 +34,9 @@ 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 8929ae5..37586bd 100644 --- a/eight_bit_int_gemm/eight_bit_int_gemm.h +++ b/eight_bit_int_gemm/eight_bit_int_gemm.h @@ -17,13 +17,6 @@ #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 2fbcda8..a443f96 100644 --- a/profiling/instrumentation.h +++ b/profiling/instrumentation.h @@ -27,13 +27,6 @@ #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 |