Skip to content

Commit 46440f3

Browse files
yukawayukawa
committed
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
1 parent d2e7239 commit 46440f3

File tree

7 files changed

+1
-157
lines changed

7 files changed

+1
-157
lines changed

‎src/android/android.gyp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,6 @@
532532
'target_name': 'subset_font',
533533
'type': 'none',
534534
'dependencies': [
535-
# TODO(komatsu): Is it better to move android_base.gyp?
536535
'resources/resources.gyp:copy_asis_svg',
537536
'resources/resources.gyp:transform_template_svg',
538537
],

‎src/android/android_base.gyp

Lines changed: 0 additions & 47 deletions
This file was deleted.

‎src/android/jni/sysconf.cc

Lines changed: 0 additions & 59 deletions
This file was deleted.

‎src/android/jni/sysconf.h

Lines changed: 0 additions & 43 deletions
This file was deleted.

‎src/base/base.gyp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,6 @@
164164
'sources': [
165165
'android_util.cc',
166166
],
167-
'dependencies': [
168-
'../android/android_base.gyp:android_sysconf',
169-
],
170167
}],
171168
['target_platform=="NaCl" and _toolset=="target"', {
172169
'sources': [

‎src/base/system_util.cc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,6 @@
6666
#include "base/win_util.h"
6767

6868
#ifdef OS_ANDROID
69-
// HACK to avoid a bug in sysconf in android.
70-
#include "android/jni/sysconf.h"
71-
#define sysconf mysysconf
7269
#include "base/android_util.h"
7370
#endif // OS_ANDROID
7471

‎src/mozc_version_template.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MAJOR=2
22
MINOR=16
3-
BUILD=2056
3+
BUILD=2057
44
REVISION=102
55
# NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
66
# downloaded by NaCl Mozc.

0 commit comments

Comments
 (0)