diff options
| author |  mtklein <mtklein@chromium.org> | 2015-04-02 10:47:57 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-04-02 10:47:57 -0700 |
| commit | 2d33a1d0b03dc7cb171c6f34680f1966fa686d38 (patch) | |
| tree | 765cc98a950bedd606798fdb7d6aedeb2846c298 /platform_tools | |
| parent | 83c645922839b7d742268d9c4b01e2a43fb8f81b (diff) | |
Streamline Thumb config.
Enable Thumb2 iff ARM v7. (We don't turn it on today for ARM <v7, and ARM v8 doesn't support it.)
BUG=skia:
Review URL: https://codereview.chromium.org/1054993002
Diffstat (limited to 'platform_tools')
| -rwxr-xr-x | platform_tools/android/bin/android_setup.sh | 6 | ||||
| -rw-r--r-- | platform_tools/android/gyp_gen/android_framework_gyp.py | 4 | ||||
| -rwxr-xr-x | platform_tools/chromeos/bin/chromeos_setup.sh | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/platform_tools/android/bin/android_setup.sh b/platform_tools/android/bin/android_setup.sh index f936f00c46..e452d746a3 100755 --- a/platform_tools/android/bin/android_setup.sh +++ b/platform_tools/android/bin/android_setup.sh @@ -104,15 +104,15 @@ setup_device() { case $TARGET_DEVICE in arm) - DEFINES="${DEFINES} skia_arch_type=arm arm_neon=0 arm_thumb=0" + DEFINES="${DEFINES} skia_arch_type=arm arm_neon=0" ANDROID_ARCH="arm" ;; arm_v7 | nexus_4 | nexus_5 | nexus_6 | nexus_7 | nexus_10 | xoom) - DEFINES="${DEFINES} skia_arch_type=arm arm_neon_optional=1 arm_version=7 arm_thumb=1" + DEFINES="${DEFINES} skia_arch_type=arm arm_neon_optional=1 arm_version=7" ANDROID_ARCH="arm" ;; arm_v7_neon) - DEFINES="${DEFINES} skia_arch_type=arm arm_neon=1 arm_version=7 arm_thumb=1" + DEFINES="${DEFINES} skia_arch_type=arm arm_neon=1 arm_version=7" ANDROID_ARCH="arm" ;; arm64 | nexus_9) diff --git a/platform_tools/android/gyp_gen/android_framework_gyp.py b/platform_tools/android/gyp_gen/android_framework_gyp.py index 787a4d91a8..34a9eeec47 100644 --- a/platform_tools/android/gyp_gen/android_framework_gyp.py +++ b/platform_tools/android/gyp_gen/android_framework_gyp.py @@ -63,8 +63,8 @@ def main(target_dir, target_file, skia_arch_type, have_neon, gyp_defines = ('skia_android_framework=1 OS=android skia_arch_type=%s ' % skia_arch_type) if skia_arch_type == 'arm': - # Always use thumb and version 7 for arm - gyp_defines += 'arm_thumb=1 arm_version=7 ' + # Always version 7 (which implies thumb) for arm + gyp_defines += 'arm_version=7 ' if have_neon: gyp_defines += 'arm_neon=1 ' else: diff --git a/platform_tools/chromeos/bin/chromeos_setup.sh b/platform_tools/chromeos/bin/chromeos_setup.sh index 134e80a348..721d7d6c53 100755 --- a/platform_tools/chromeos/bin/chromeos_setup.sh +++ b/platform_tools/chromeos/bin/chromeos_setup.sh @@ -35,7 +35,7 @@ setup_device() { ;; daisy) # TODO(mtklein): make this arm_neon=1 - DEFINES="${DEFINES} skia_arch_type=arm arm_version=7 arm_neon=0 arm_thumb=0" + DEFINES="${DEFINES} skia_arch_type=arm arm_version=7 arm_neon=0" # TODO(borenet): We have to define skia_warnings_as_errors=0 for the arm # build, which throws lots of "mangling of va_list has changed" warnings. DEFINES="${DEFINES} skia_warnings_as_errors=0" |