summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHidehiko Abe <hidehiko@google.com>2018-04-25 14:25:18 +0900
committerHidehiko Abe <hidehiko@google.com>2018-04-25 14:25:18 +0900
commit2e2446af20fcd5c2202fc40c5f50c66b983c706e (patch)
tree842886c57317b76d09bf63bdea388cdc818a7042
parentb268b43ac6fdbc4f3a2ed1429b99ace424906090 (diff)
downloadlibchrome-2e2446af20fcd5c2202fc40c5f50c66b983c706e.tar.gz
Originally, it was introduced in libmojo, when the library was built with OS_ANDROID. Now, it is no longer OS_ANDROID so those files are no longer used. Bug: 73270448 Test: Built locally. Made sure "#include "base/os_compat_android.h" is wrapped by "#if defined(OS_ANDROID)". Change-Id: Idf9cedb1af69aa4d19bd6b1bbfc9292ee53ac9c0
-rw-r--r--base/os_compat_android.cc177
-rw-r--r--base/os_compat_android.h28
-rw-r--r--base/os_compat_android_unittest.cc41
3 files changed, 0 insertions, 246 deletions
diff --git a/base/os_compat_android.cc b/base/os_compat_android.cc
deleted file mode 100644
index 1eb6536bb1..0000000000
--- a/base/os_compat_android.cc
+++ /dev/null
@@ -1,177 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "base/os_compat_android.h"
-
-#include <asm/unistd.h>
-#include <errno.h>
-#include <limits.h>
-#include <math.h>
-#include <sys/stat.h>
-#include <sys/syscall.h>
-
-#if !defined(__LP64__)
-#include <time64.h>
-#endif
-
-#include "base/rand_util.h"
-#include "base/strings/string_piece.h"
-#include "base/strings/stringprintf.h"
-
-extern "C" {
-// There is no futimes() avaiable in Bionic, so we provide our own
-// implementation until it is there.
-int futimes(int fd, const struct timeval tv[2]) {
- if (tv == NULL)
- return syscall(__NR_utimensat, fd, NULL, NULL, 0);
-
- if (tv[0].tv_usec < 0 || tv[0].tv_usec >= 1000000 ||
- tv[1].tv_usec < 0 || tv[1].tv_usec >= 1000000) {
- errno = EINVAL;
- return -1;
- }
-
- // Convert timeval to timespec.
- struct timespec ts[2];
- ts[0].tv_sec = tv[0].tv_sec;
- ts[0].tv_nsec = tv[0].tv_usec * 1000;
- ts[1].tv_sec = tv[1].tv_sec;
- ts[1].tv_nsec = tv[1].tv_usec * 1000;
- return syscall(__NR_utimensat, fd, NULL, ts, 0);
-}
-
-#if !defined(__LP64__)
-// 32-bit Android has only timegm64() and not timegm().
-// We replicate the behaviour of timegm() when the result overflows time_t.
-time_t timegm(struct tm* const t) {
- // time_t is signed on Android.
- static const time_t kTimeMax = ~(1L << (sizeof(time_t) * CHAR_BIT - 1));
- static const time_t kTimeMin = (1L << (sizeof(time_t) * CHAR_BIT - 1));
- time64_t result = timegm64(t);
- if (result < kTimeMin || result > kTimeMax)
- return -1;
- return result;
-}
-#endif
-
-// The following is only needed when building with GCC 4.6 or higher
-// (i.e. not with Android GCC 4.4.3, nor with Clang).
-//
-// GCC is now capable of optimizing successive calls to sin() and cos() into
-// a single call to sincos(). This means that source code that looks like:
-//
-// double c, s;
-// c = cos(angle);
-// s = sin(angle);
-//
-// Will generate machine code that looks like:
-//
-// double c, s;
-// sincos(angle, &s, &c);
-//
-// Unfortunately, sincos() and friends are not part of the Android libm.so
-// library provided by the NDK for API level 9. When the optimization kicks
-// in, it makes the final build fail with a puzzling message (puzzling
-// because 'sincos' doesn't appear anywhere in the sources!).
-//
-// To solve this, we provide our own implementation of the sincos() function
-// and related friends. Note that we must also explicitely tell GCC to disable
-// optimizations when generating these. Otherwise, the generated machine code
-// for each function would simply end up calling itself, resulting in a
-// runtime crash due to stack overflow.
-//
-#if defined(__GNUC__) && !defined(__clang__) && \
- !defined(ANDROID_SINCOS_PROVIDED)
-
-// For the record, Clang does not support the 'optimize' attribute.
-// In the unlikely event that it begins performing this optimization too,
-// we'll have to find a different way to achieve this. NOTE: Tested with O1
-// which still performs the optimization.
-//
-#define GCC_NO_OPTIMIZE __attribute__((optimize("O0")))
-
-GCC_NO_OPTIMIZE
-void sincos(double angle, double* s, double *c) {
- *c = cos(angle);
- *s = sin(angle);
-}
-
-GCC_NO_OPTIMIZE
-void sincosf(float angle, float* s, float* c) {
- *c = cosf(angle);
- *s = sinf(angle);
-}
-
-#endif // __GNUC__ && !__clang__
-
-// An implementation of mkdtemp, since it is not exposed by the NDK
-// for native API level 9 that we target.
-//
-// For any changes in the mkdtemp function, you should manually run the unittest
-// OsCompatAndroidTest.DISABLED_TestMkdTemp in your local machine to check if it
-// passes. Please don't enable it, since it creates a directory and may be
-// source of flakyness.
-char* mkdtemp(char* path) {
- if (path == NULL) {
- errno = EINVAL;
- return NULL;
- }
-
- const int path_len = strlen(path);
-
- // The last six characters of 'path' must be XXXXXX.
- const base::StringPiece kSuffix("XXXXXX");
- const int kSuffixLen = kSuffix.length();
- if (!base::StringPiece(path, path_len).ends_with(kSuffix)) {
- errno = EINVAL;
- return NULL;
- }
-
- // If the path contains a directory, as in /tmp/foo/XXXXXXXX, make sure
- // that /tmp/foo exists, otherwise we're going to loop a really long
- // time for nothing below
- char* dirsep = strrchr(path, '/');
- if (dirsep != NULL) {
- struct stat st;
- int ret;
-
- *dirsep = '\0'; // Terminating directory path temporarily
-
- ret = stat(path, &st);
-
- *dirsep = '/'; // Restoring directory separator
- if (ret < 0) // Directory probably does not exist
- return NULL;
- if (!S_ISDIR(st.st_mode)) { // Not a directory
- errno = ENOTDIR;
- return NULL;
- }
- }
-
- // Max number of tries using different random suffixes.
- const int kMaxTries = 100;
-
- // Now loop until we CAN create a directory by that name or we reach the max
- // number of tries.
- for (int i = 0; i < kMaxTries; ++i) {
- // Fill the suffix XXXXXX with a random string composed of a-z chars.
- for (int pos = 0; pos < kSuffixLen; ++pos) {
- char rand_char = static_cast<char>(base::RandInt('a', 'z'));
- path[path_len - kSuffixLen + pos] = rand_char;
- }
- if (mkdir(path, 0700) == 0) {
- // We just created the directory succesfully.
- return path;
- }
- if (errno != EEXIST) {
- // The directory doesn't exist, but an error occured
- return NULL;
- }
- }
-
- // We reached the max number of tries.
- return NULL;
-}
-
-} // extern "C"
diff --git a/base/os_compat_android.h b/base/os_compat_android.h
deleted file mode 100644
index 0f2544496d..0000000000
--- a/base/os_compat_android.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef BASE_OS_COMPAT_ANDROID_H_
-#define BASE_OS_COMPAT_ANDROID_H_
-
-#include <fcntl.h>
-#include <sys/types.h>
-#include <utime.h>
-
-// Not implemented in Bionic.
-extern "C" int futimes(int fd, const struct timeval tv[2]);
-
-// Not exposed or implemented in Bionic.
-extern "C" char* mkdtemp(char* path);
-
-// Android has no timegm().
-extern "C" time_t timegm(struct tm* const t);
-
-// The lockf() function is not available on Android; we translate to flock().
-#define F_LOCK LOCK_EX
-#define F_ULOCK LOCK_UN
-inline int lockf(int fd, int cmd, off_t ignored_len) {
- return flock(fd, cmd);
-}
-
-#endif // BASE_OS_COMPAT_ANDROID_H_
diff --git a/base/os_compat_android_unittest.cc b/base/os_compat_android_unittest.cc
deleted file mode 100644
index 7fbdc6dace..0000000000
--- a/base/os_compat_android_unittest.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "base/os_compat_android.h"
-
-#include "base/files/file_util.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-namespace base {
-
-typedef testing::Test OsCompatAndroidTest;
-
-// Keep this Unittest DISABLED_ , because it actually creates a directory in the
-// device and it may be source of flakyness. For any changes in the mkdtemp
-// function, you should run this unittest in your local machine to check if it
-// passes.
-TEST_F(OsCompatAndroidTest, DISABLED_TestMkdTemp) {
- FilePath tmp_dir;
- EXPECT_TRUE(base::GetTempDir(&tmp_dir));
-
- // Not six XXXXXX at the suffix of the path.
- FilePath sub_dir = tmp_dir.Append("XX");
- std::string sub_dir_string = sub_dir.value();
- // this should be OK since mkdtemp just replaces characters in place
- char* buffer = const_cast<char*>(sub_dir_string.c_str());
- EXPECT_EQ(NULL, mkdtemp(buffer));
-
- // Directory does not exist
- char invalid_path2[] = "doesntoexist/foobarXXXXXX";
- EXPECT_EQ(NULL, mkdtemp(invalid_path2));
-
- // Successfully create a tmp dir.
- FilePath sub_dir2 = tmp_dir.Append("XXXXXX");
- std::string sub_dir2_string = sub_dir2.value();
- // this should be OK since mkdtemp just replaces characters in place
- char* buffer2 = const_cast<char*>(sub_dir2_string.c_str());
- EXPECT_TRUE(mkdtemp(buffer2) != NULL);
-}
-
-} // namespace base