Unsupport armeabi for Android in favor of armeabi-v7a
In Android 4.0 and later, it is guaranteed that all the arm (32-bit) devices can support armeabi-v7a. There is no reason to continue supporting armeabi anymore.
BUG=none
TEST=compile
git-svn-id: https://mozc.googlecode.com/svn/trunk@394 a6090854-d499-a067-5803-1114d4e51264
diff --git a/src/android/src/com/google/android/inputmethod/japanese/MozcUtil.java b/src/android/src/com/google/android/inputmethod/japanese/MozcUtil.java
index a2eb847..1f5475a 100644
--- a/src/android/src/com/google/android/inputmethod/japanese/MozcUtil.java
+++ b/src/android/src/com/google/android/inputmethod/japanese/MozcUtil.java
@@ -309,8 +309,8 @@
// Version code format:
// 00000BBBBB or
// 0005BBBBBA
- // A: ABI (0: Fat, 5: x86, 4: armeabi-v7a, 3: armeabi, 1:mips)
- // B: Build number
+ // A: ABI (0: Fat, 5: x86, 2: armeabi-v7a, 1:mips)
+ // B: ANDROID_VERSION_CODE
Preconditions.checkNotNull(context);
int rawVersionCode = getVersionCode(context);
String versionCode = Integer.toString(getVersionCode(context));
diff --git a/src/build_mozc.py b/src/build_mozc.py
index 9374d3f..f2dc394 100644
--- a/src/build_mozc.py
+++ b/src/build_mozc.py
@@ -1193,7 +1193,7 @@
in android_util.GetAvailableEmulatorPorts(android_home)
if i >= int(options.android_min_port)]
if GetMozcVersion().GetAndroidArch() == 'arm':
- acceptable_abi = ['armeabi', 'armeabi-v7a']
+ acceptable_abi = ['armeabi-v7a']
else:
acceptable_abi = [GetMozcVersion().GetAndroidArch()]
avd_names = [i for i in android_util.GetAvdNames(android_sdk_home)
diff --git a/src/build_tools/mozc_version.py b/src/build_tools/mozc_version.py
index 4094874..3dd259f 100644
--- a/src/build_tools/mozc_version.py
+++ b/src/build_tools/mozc_version.py
@@ -165,7 +165,7 @@
Version code format:
0005BBBBBA
- A: ABI (0: Fat, 5: x86, 4: armeabi-v7a, 3: armeabi, 1:mips)
+ A: ABI (0: Fat, 5: x86, 2: armeabi-v7a, 1:mips)
B: ANDROID_VERSION_CODE
Note:
@@ -176,20 +176,13 @@
Therefore version-check rule like "Version code of update must be greater
than that of previous" cannot be introduced.
"""
- if arch == 'x86':
- abi_code = 5
- elif arch == 'arm':
- # abi_code 3 is for armeabi and 4 is for armeabi-v7a.
- # Currently armeabi-v7a is not supported.
- # Note for future improvement:
- # armeabi-v7a's version code must be greater than armeabi's.
- # By this v7a's apk is prioritized on the Play.
- # Without this all the ARM devices download armeabi version
- # because armeabi can be run on all of them (including v7a).
- abi_code = 3
- elif arch == 'mips':
- abi_code = 1
- else:
+ arch_to_abi_code = {
+ 'x86': 5,
+ 'arm': 2,
+ 'mips': 1,
+ }
+ abi_code = arch_to_abi_code.get(arch)
+ if abi_code is None:
raise RuntimeError('Unexpected architecture; %s' % arch)
if base_version_code >= 10000:
raise RuntimeError('Version code is greater than 10000. '
diff --git a/src/gyp/common.gypi b/src/gyp/common.gypi
index 89ccb76..4dc54b5 100644
--- a/src/gyp/common.gypi
+++ b/src/gyp/common.gypi
@@ -357,7 +357,15 @@
],
'conditions': [
['android_arch=="arm"', {
+ 'ldflags+': [
+ # Support only armv7-a. Both LDFLAG and CLFAGS should have this.
+ '-march=armv7-a',
+ ],
'cflags': [
+ # Support only armv7-a. Both LDFLAG and CLFAGS should have this.
+ '-march=armv7-a',
+ '-mfloat-abi=softfp',
+ '-mfpu=vfpv3-d16',
'-mthumb', # Force thumb interaction set for smaller file size.
],
}],
diff --git a/src/mozc_version_template.txt b/src/mozc_version_template.txt
index 432b82a..6de0b84 100644
--- a/src/mozc_version_template.txt
+++ b/src/mozc_version_template.txt
@@ -1,6 +1,6 @@
MAJOR=2
MINOR=16
-BUILD=1934
+BUILD=1935
REVISION=102
# NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
# downloaded by NaCl Mozc.
