diff options
| -rw-r--r-- | gyp/opts.gyp | 2 | ||||
| -rw-r--r-- | platform_tools/android/gyp_gen/makefile_writer.py | 5 | ||||
| -rw-r--r-- | platform_tools/android/tests/expectations/Android.mk | 4 |
3 files changed, 1 insertions, 10 deletions
diff --git a/gyp/opts.gyp b/gyp/opts.gyp index 783ea4eb7a..745259f750 100644 --- a/gyp/opts.gyp +++ b/gyp/opts.gyp @@ -103,7 +103,7 @@ }], [ '(skia_arch_type == "mips") or (skia_arch_type == "arm" and arm_version < 7) \ or (skia_os == "ios") \ - or (skia_os == "android" and skia_arch_type not in ["x86", "arm", "mips"])', { + or (skia_os == "android" and skia_arch_type not in ["x86", "arm", "mips", "arm64"])', { 'sources': [ '../src/opts/SkBitmapProcState_opts_none.cpp', '../src/opts/SkBlitMask_opts_none.cpp', 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 |