Skip to content
Permalink
Browse files

Remove a workaround for sysconf w/ _SC_PHYS_PAGES

sysconf with _SC_PHYS_PAGES did not work on Android 2.2 and prior due to a bug in bionic. That bug in question was fixed in Android 2.3 as follows.
https://android.googlesource.com/platform/bionic/+/038fbae518e904c7aba64779714a22dbeeb90887

Mozc has worked around this issue by emulating sysconf with _SC_PHYS_PAGES in android/jni/sysconf.cc.  However, we no longer have to do that because Mozc don’t support those legacy platforms anymore.

This CL is just a removal of redundant historical code.  No behavior change is intended.

BUG=none
TEST=none

git-svn-id: https://mozc.googlecode.com/svn/trunk@540 a6090854-d499-a067-5803-1114d4e51264
  • Loading branch information...
yukawa committed Feb 8, 2015
1 parent d2e7239 commit 46440f371dda6a16e3e69b2be6df2fe6391c5464
@@ -532,7 +532,6 @@
'target_name': 'subset_font',
'type': 'none',
'dependencies': [
# TODO(komatsu): Is it better to move android_base.gyp?
'resources/resources.gyp:copy_asis_svg',
'resources/resources.gyp:transform_template_svg',
],

This file was deleted.

This file was deleted.

This file was deleted.

@@ -164,9 +164,6 @@
'sources': [
'android_util.cc',
],
'dependencies': [
'../android/android_base.gyp:android_sysconf',
],
}],
['target_platform=="NaCl" and _toolset=="target"', {
'sources': [
@@ -66,9 +66,6 @@
#include "base/win_util.h"

#ifdef OS_ANDROID
// HACK to avoid a bug in sysconf in android.
#include "android/jni/sysconf.h"
#define sysconf mysysconf
#include "base/android_util.h"
#endif // OS_ANDROID

@@ -1,6 +1,6 @@
MAJOR=2
MINOR=16
BUILD=2056
BUILD=2057
REVISION=102
# NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
# downloaded by NaCl Mozc.

0 comments on commit 46440f3

Please sign in to comment.
You can’t perform that action at this time.