Remove posix_memalign from libandroid_support.

This function is now available in all supported API levels.

Test: ./checkbuild.py && ./run_tests.py
Bug: None
Change-Id: I209789d36e1e06a4edc4beb7050a8063f359a5ca

5 files changed, 0 insertions, 96 deletions

diff --git a/sources/android/support/Android.mk b/sources/android/support/Android.mk
index d0e0060db..89ba793bb 100644
--- a/sources/android/support/Android.mk
+++ b/sources/android/support/Android.mk
@@ -104,7 +104,6 @@ android_support_sources := \
     $(BIONIC_PATH)/libm/upstream-freebsd/lib/msun/src/s_tan.c \
     $(BIONIC_PATH)/libm/upstream-freebsd/lib/msun/src/s_tanh.c \
     src/locale_support.cpp \
-    src/posix_memalign.cpp \
     src/swprintf.cpp \
     src/wcstox.cpp \
 
diff --git a/sources/android/support/include/stdlib.h b/sources/android/support/include/stdlib.h
index b0cc57974..a6895d6a8 100644
--- a/sources/android/support/include/stdlib.h
+++ b/sources/android/support/include/stdlib.h
@@ -33,10 +33,6 @@
 
 __BEGIN_DECLS
 
-#if __ANDROID_API__ < __ANDROID_API_J__
-int posix_memalign(void** memptr, size_t alignment, size_t size);
-#endif
-
 #if __ANDROID_API__ < __ANDROID_API_L__
 #undef MB_CUR_MAX
 size_t __ctype_get_mb_cur_max(void);
diff --git a/sources/android/support/src/posix_memalign.cpp b/sources/android/support/src/posix_memalign.cpp
deleted file mode 100644
index cf7abbbf5..000000000
--- a/sources/android/support/src/posix_memalign.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#include <errno.h>
-#include <malloc.h>
-#include <stdlib.h>
-
-int posix_memalign(void** memptr, size_t alignment, size_t size) {
-  if ((alignment & (alignment - 1)) != 0 || alignment == 0) {
-    return EINVAL;
-  }
-
-  if (alignment % sizeof(void*) != 0) {
-    return EINVAL;
-  }
-
-  *memptr = memalign(alignment, size);
-  if (*memptr == NULL) {
-    return errno;
-  }
-
-  return 0;
-}
diff --git a/tests/device/android_support/jni/Android.mk b/tests/device/android_support/jni/Android.mk
index 0a937d39e..70a455d73 100644
--- a/tests/device/android_support/jni/Android.mk
+++ b/tests/device/android_support/jni/Android.mk
@@ -34,7 +34,6 @@ LOCAL_SRC_FILES := \
     inttypes_test.cpp \
     math_test.cpp \
     platform_version.cpp \
-    stdlib_test.cpp \
     wcstox_test.cpp \
     swprintf_test.cpp \
 
diff --git a/tests/device/android_support/jni/stdlib_test.cpp b/tests/device/android_support/jni/stdlib_test.cpp
deleted file mode 100644
index 09aa4d764..000000000
--- a/tests/device/android_support/jni/stdlib_test.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *  * Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  * Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <gtest/gtest.h>
-
-#include <stdlib.h>
-
-TEST(stdlib, posix_memalign_sweep) {
-  void* ptr;
-
-  // These should all fail.
-  for (size_t align = 0; align < sizeof(long); align++) {
-    ASSERT_EQ(EINVAL, posix_memalign(&ptr, align, 256))
-        << "Unexpected value at align " << align;
-  }
-
-  // Verify powers of 2 up to 2048 allocate, and verify that all other
-  // alignment values between the powers of 2 fail.
-  size_t last_align = sizeof(long);
-  for (size_t align = sizeof(long); align <= 2048; align <<= 1) {
-    // Try all of the non power of 2 values from the last until this value.
-    for (size_t fail_align = last_align + 1; fail_align < align; fail_align++) {
-      ASSERT_EQ(EINVAL, posix_memalign(&ptr, fail_align, 256))
-          << "Unexpected success at align " << fail_align;
-    }
-    ASSERT_EQ(0, posix_memalign(&ptr, align, 256))
-        << "Unexpected failure at align " << align;
-    ASSERT_EQ(0U, reinterpret_cast<uintptr_t>(ptr) & (align - 1))
-        << "Did not return a valid aligned ptr " << ptr << " expected alignment " << align;
-    free(ptr);
-    last_align = align;
-  }
-}
-
-TEST(stdlib, posix_memalign_various_sizes) {
-  std::vector<size_t> sizes{1, 4, 8, 256, 1024, 65000, 128000, 256000, 1000000};
-  for (auto size : sizes) {
-    void* ptr;
-    ASSERT_EQ(0, posix_memalign(&ptr, 16, 1))
-        << "posix_memalign failed at size " << size;
-    ASSERT_EQ(0U, reinterpret_cast<uintptr_t>(ptr) & 0xf)
-        << "Pointer not aligned at size " << size << " ptr " << ptr;
-    free(ptr);
-  }
-}