diff options
Diffstat (limited to 'gn')
| -rw-r--r-- | gn/core.gni | 20 | ||||
| -rw-r--r-- | gn/gn_to_bp.py | 3 | ||||
| -rw-r--r-- | gn/opts.gni | 1 | ||||
| -rw-r--r-- | gn/shared_sources.gni | 2 |
4 files changed, 7 insertions, 19 deletions
diff --git a/gn/core.gni b/gn/core.gni index bcec7c02f0..12a74ae93b 100644 --- a/gn/core.gni +++ b/gn/core.gni @@ -440,6 +440,8 @@ skia_core_sources = [ "$_include/core/SkUnPreMultiply.h", "$_include/core/SkVertices.h", + "$_src/jumper/SkJumper.cpp", + # private "$_include/private/SkAtomics.h", "$_include/private/SkChecksum.h", @@ -527,20 +529,4 @@ skia_core_sources = [ "$_src/pathops/SkReduceOrder.h", ] -skia_core_sources += [ - "$_src/jumper/SkJumper.cpp", - "$_src/jumper/SkJumper_stages.cpp", - "$_src/jumper/SkJumper_stages_lowp.cpp", -] -skia_core_defines = [] -if (is_win) { - if (host_os == "win") { - skia_core_sources += [ "$_src/jumper/SkJumper_generated_win.S" ] - } else { - # TODO(thakis): Enable jumper in linux->win cross builds once the - # assembler situation is figured out, https://crbug.com/762167 - skia_core_defines += [ "SK_JUMPER_USE_ASSEMBLY=0" ] - } -} else if (target_cpu != "wasm") { - skia_core_sources += [ "$_src/jumper/SkJumper_generated.S" ] -} +skia_core_defines = [] # Used to be used by Chromium, but no longer. diff --git a/gn/gn_to_bp.py b/gn/gn_to_bp.py index 0dfada3ea2..4c8cba75d5 100644 --- a/gn/gn_to_bp.py +++ b/gn/gn_to_bp.py @@ -289,7 +289,8 @@ with open('Android.bp', 'w') as f: defs['ssse3'] + defs['sse41'] + defs['sse42'] + - defs['avx' ]), + defs['avx' ] + + defs['hsw' ]), 'dm_includes' : bpfmt(8, dm_includes), 'dm_srcs' : bpfmt(8, dm_srcs), diff --git a/gn/opts.gni b/gn/opts.gni index 1cc6027af2..34481db3b6 100644 --- a/gn/opts.gni +++ b/gn/opts.gni @@ -51,3 +51,4 @@ ssse3 = [ sse41 = [ "$_src/opts/SkOpts_sse41.cpp" ] sse42 = [ "$_src/opts/SkOpts_sse42.cpp" ] avx = [ "$_src/opts/SkOpts_avx.cpp" ] +hsw = [ "$_src/opts/SkOpts_hsw.cpp" ] diff --git a/gn/shared_sources.gni b/gn/shared_sources.gni index 29cac671a4..6df999921a 100644 --- a/gn/shared_sources.gni +++ b/gn/shared_sources.gni @@ -24,7 +24,7 @@ skia_opts = { sse41_sources = sse41 sse42_sources = sse42 avx_sources = avx - hsw_sources = [] # remove after we update Chrome + hsw_sources = hsw } # Skia Chromium defines. These flags will be defined in chromium If these |