From eb467a8b852e607dbf5dc0cab662e89b1495c516 Mon Sep 17 00:00:00 2001 From: Ryan Macnak Date: Thu, 6 Jul 2017 14:40:34 -0700 Subject: [PATCH] Don't enable_profiling for x86 Android. (#3848) This somehow introduces text relocations even though we always use -fPIC. --- tools/gn | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/gn b/tools/gn index 11d634b1dc78d..1435c8020f309 100755 --- a/tools/gn +++ b/tools/gn @@ -156,7 +156,9 @@ def to_gn_args(args): gn_args['skia_use_vulkan'] = True gn_args['skia_vulkan_headers'] = "//third_party/vulkan/src" - gn_args['enable_profiling'] = args.runtime_mode != 'release' + # We should not need a special case for x86, but this seems to introduce text relocations + # even with -fPIC everywhere. + gn_args['enable_profiling'] = args.runtime_mode != 'release' and args.android_cpu != 'x86' return gn_args