diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-09 13:34:26 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-09 13:34:26 +0000 |
| commit | 479d1ae9b693fb6cf739371c32916523da7b09df (patch) | |
| tree | 113bf5ddbad7f983e6a8e8f8416ede4b82f26455 /platform_tools | |
| parent | 95c2e5532b094add82b007bdfcd4c64050b6b366 (diff) | |
Fixes to Android.mk generation for arm64.
Remove warning about no optimizations for arm64 and rebaseline the
associated test.
Exclude _opts_none.cpps when building arm64, to avoid double definitions.
BUG=skia:1975
R=halcanary@google.com, djsollen@google.com
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/229393002
git-svn-id: http://skia.googlecode.com/svn/trunk@14104 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'platform_tools')
| -rw-r--r-- | platform_tools/android/gyp_gen/makefile_writer.py | 5 | ||||
| -rw-r--r-- | platform_tools/android/tests/expectations/Android.mk | 4 |
2 files changed, 0 insertions, 9 deletions
diff --git a/platform_tools/android/gyp_gen/makefile_writer.py b/platform_tools/android/gyp_gen/makefile_writer.py index f4cdbef44d..1b977ca1e6 100644 --- a/platform_tools/android/gyp_gen/makefile_writer.py +++ b/platform_tools/android/gyp_gen/makefile_writer.py @@ -195,11 +195,6 @@ def write_android_mk(target_dir, common, deviations_from_common): f.write('\tLOCAL_CFLAGS += -DNO_FALLBACK_FONT\n') f.write('endif\n\n') - f.write('ifeq ($(TARGET_ARCH),arm64)\n') - f.write(' $(warning TODOArm64: Unlike arm32, arm64 has no inline' - ' assembly for performance critical code.)\n') - f.write('endif\n\n') - write_local_vars(f, common, False, None) for data in deviations_from_common: diff --git a/platform_tools/android/tests/expectations/Android.mk b/platform_tools/android/tests/expectations/Android.mk index ced1a29d4d..9fab0ac2d9 100644 --- a/platform_tools/android/tests/expectations/Android.mk +++ b/platform_tools/android/tests/expectations/Android.mk @@ -49,10 +49,6 @@ ifeq ($(NO_FALLBACK_FONT),true) LOCAL_CFLAGS += -DNO_FALLBACK_FONT endif -ifeq ($(TARGET_ARCH),arm64) - $(warning TODOArm64: Unlike arm32, arm64 has no inline assembly for performance critical code.) -endif - LOCAL_CFLAGS += \ local_cflags |