Remove some obsolete tests.

The NDK used to support defining `_WCHAR_IS_8BIT` to get an 8-bit
wchar (this was for compatibility with Froyo and earlier releases). We
don't support targeting anything before Gingerbread any more, so I
don't think we need this compatibility flag now (it's already gone
from the NDK sys/cdefs.h).

Change-Id: I13e748a9038b2c7c80d417e3ddb0c6bd9ae57bd5

4 files changed, 0 insertions, 111 deletions

diff --git a/tests/build/wchar_t-size/jni/Android.mk b/tests/build/wchar_t-size/jni/Android.mk
index cc8ed4135..c6e42662d 100644
--- a/tests/build/wchar_t-size/jni/Android.mk
+++ b/tests/build/wchar_t-size/jni/Android.mk
@@ -4,9 +4,6 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := test_wchar_t_size
 LOCAL_SRC_FILES := \
   test_default.c \
-  test_8bit.c \
-  test_8bit_cplusplus.cpp \
-  test_8bit_cplusplus_stdc_limit_macros.cpp \
   test_always_signed.c \
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/tests/build/wchar_t-size/jni/test_8bit.c b/tests/build/wchar_t-size/jni/test_8bit.c
deleted file mode 100644
index 765c477f9..000000000
--- a/tests/build/wchar_t-size/jni/test_8bit.c
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <android/api-level.h>
-
-#if !__LP64__ && !defined(__arm__) || __ANDROID_API__ == 3
-
-// This checks that simply including <wchar.h> with
-// _WCHAR_IS_8BIT defined will provice an 8-bit wchar_t
-// and 8-bit WCHAR_MIN/WCHAR_MAX.
-
-// Force wchar_t to be 8 bits.
-#define _WCHAR_IS_8BIT
-#include <wchar.h>
-
-#define CONCAT(x,y) CONCAT_(x,y)
-#define CONCAT_(x,y) x ## y
-
-#define STATIC_ASSERT(condition) \
-  static char CONCAT(dummy_,__LINE__)[1 - 2*(!(condition))];
-
-#if defined(__arm__) || __ANDROID_API__ < 9
-STATIC_ASSERT(sizeof(__WCHAR_TYPE__) == 1);
-STATIC_ASSERT(sizeof(wchar_t) == 1);
-#else
-STATIC_ASSERT(sizeof(__WCHAR_TYPE__) == 4);
-STATIC_ASSERT(sizeof(wchar_t) == 4);
-#endif
-
-// Since this is C code, the old behaviour was to always define
-// these constants as signed 32 bit values.
-STATIC_ASSERT(WCHAR_MIN == 0x80000000);
-STATIC_ASSERT(WCHAR_MAX == 0x7fffffff);
-
-#endif
\ No newline at end of file
diff --git a/tests/build/wchar_t-size/jni/test_8bit_cplusplus.cpp b/tests/build/wchar_t-size/jni/test_8bit_cplusplus.cpp
deleted file mode 100644
index 28041a645..000000000
--- a/tests/build/wchar_t-size/jni/test_8bit_cplusplus.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-#include <android/api-level.h>
-
-#if !__LP64__ && !defined(__arm__) || __ANDROID_API__ == 3
-
-// This checks that simply including <wchar.h> with
-// _WCHAR_IS_8BIT defined will provice an 8-bit wchar_t
-// and 8-bit WCHAR_MIN/WCHAR_MAX.
-
-// Force wchar_t to be 8 bits.
-#define _WCHAR_IS_8BIT
-#include <wchar.h>
-
-#define CONCAT(x,y) CONCAT_(x,y)
-#define CONCAT_(x,y) x ## y
-
-#define STATIC_ASSERT(condition) \
-  static char CONCAT(dummy_,__LINE__)[1 - 2*(!(condition))];
-
-#if defined(__arm__) || __ANDROID_API__ < 9
-STATIC_ASSERT(sizeof(__WCHAR_TYPE__) == 1);
-#else
-STATIC_ASSERT(sizeof(__WCHAR_TYPE__) == 4);
-#endif
-
-// wchar_t is never redefined by <stddef.h> because it's a C++ keyword,
-// unlike in C.
-STATIC_ASSERT(sizeof(wchar_t) == 4);
-
-// Since this is C++ code, and __STC_LIMIT_MACROS was not defined, the
-// old behaviour on ARM was to define these constants to 8-bit values.
-// Otherwise, always signed 32-bit values.
-#ifdef __arm__
-STATIC_ASSERT(WCHAR_MIN == 0);
-STATIC_ASSERT(WCHAR_MAX == 255);
-#else
-STATIC_ASSERT(WCHAR_MIN == 0x80000000);
-STATIC_ASSERT(WCHAR_MAX == 0x7fffffff);
-#endif
-
-#endif
\ No newline at end of file
diff --git a/tests/build/wchar_t-size/jni/test_8bit_cplusplus_stdc_limit_macros.cpp b/tests/build/wchar_t-size/jni/test_8bit_cplusplus_stdc_limit_macros.cpp
deleted file mode 100644
index 7d6a024f6..000000000
--- a/tests/build/wchar_t-size/jni/test_8bit_cplusplus_stdc_limit_macros.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-#include <android/api-level.h>
-
-#if !__LP64__ && !defined(__arm__) || __ANDROID_API__ == 3
-
-// This checks that simply including <wchar.h> with
-// _WCHAR_IS_8BIT defined will provice an 8-bit wchar_t
-// and 8-bit WCHAR_MIN/WCHAR_MAX.
-
-// Force WCHAR_MIN/WCHAR_MAX to 32-bit values.
-#define __STDC_LIMIT_MACROS
-// Force wchar_t to be 8 bits.
-#define _WCHAR_IS_8BIT
-#include <wchar.h>
-
-#define CONCAT(x,y) CONCAT_(x,y)
-#define CONCAT_(x,y) x ## y
-
-#define STATIC_ASSERT(condition) \
-  static char CONCAT(dummy_,__LINE__)[1 - 2*(!(condition))];
-
-#if defined(__arm__) || __ANDROID_API__ < 9
-STATIC_ASSERT(sizeof(__WCHAR_TYPE__) == 1);
-#else
-STATIC_ASSERT(sizeof(__WCHAR_TYPE__) == 4);
-#endif
-
-// wchar_t is never redefined by <stddef.h> because it's a C++ keyword,
-// unlike in C.
-STATIC_ASSERT(sizeof(wchar_t) == 4);
-
-// This is C++ code but __STDC_LIMIT_MACROS was defined, and
-// _WCHAR_IS_8BIT is defined, so the values are always 32-bit signed.
-STATIC_ASSERT(WCHAR_MIN == 0x80000000);
-STATIC_ASSERT(WCHAR_MAX == 0x7fffffff);
-
-#endif
\ No newline at end of file