diff --git a/tools/gn b/tools/gn index 11d634b1dc7..1435c8020f3 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