update CMake and Google3 builds for AVX/AVX2

BUILD.public

 # Description:
 #   Skia graphics library.
 #
 #   Definitions for Google BUILD file.
 
 exports_files(["BUILD.public"])
 
 # All platform-independent SRCS.
 BASE_SRCS = glob(
     [
@@ skipping 66 matching lines @@
         "src/opts/*arm*",
         "src/opts/*mips*",
         "src/opts/*NEON*",
         "src/opts/*neon*",
         # Included in :opts_ssse3 library.
         "src/opts/*SSSE3*",
         "src/opts/*ssse3*",
         # Included in :opts_sse4 library.
         "src/opts/*SSE4*",
         "src/opts/*sse4*",
+        # Included in :opts_avx or :opts_avx2
+        "src/opts/*avx*",
         "src/opts/SkBitmapProcState_opts_none.cpp",
         "src/opts/SkBlitMask_opts_none.cpp",
         "src/opts/SkBlitRow_opts_none.cpp",
         "src/ports/*android*",
         "src/ports/*chromium*",
         "src/ports/*mac*",
         "src/ports/*mozalloc*",
         "src/ports/*nacl*",
         "src/ports/*win*",
         "src/ports/SkFontConfigInterface_direct_factory.cpp",
@@ skipping 19 matching lines @@
         "src/ports/**/*.cpp",
         "src/ports/**/*.h",
     ],
     exclude = [
         "src/opts/*mips*",
         "src/opts/*SSE2*",
         "src/opts/*SSSE3*",
         "src/opts/*ssse3*",
         "src/opts/*SSE4*",
         "src/opts/*sse4*",
+        "src/opts/*avx*",
         "src/opts/*x86*",
         "src/opts/SkBitmapProcState_opts_none.cpp",
         "src/opts/SkBlitMask_opts_none.cpp",
         "src/opts/SkBlitRow_opts_none.cpp",
         "src/ports/*chromium*",
         "src/ports/*fontconfig*",
         "src/ports/*FontConfig*",
         "src/ports/*mac*",
         "src/ports/*mozalloc*",
         "src/ports/*nacl*",
@@ skipping 22 matching lines @@
     ],
     exclude = [
         "src/opts/*mips*",
         "src/opts/*NEON*",
         "src/opts/*neon*",
         "src/opts/*SSE2*",
         "src/opts/*SSSE3*",
         "src/opts/*ssse3*",
         "src/opts/*SSE4*",
         "src/opts/*sse4*",
+        "src/opts/*avx*",
         "src/opts/*x86*",
         "src/opts/SkBitmapProcState_opts_none.cpp",
         "src/opts/SkBlitMask_opts_none.cpp",
         "src/opts/SkBlitRow_opts_none.cpp",
         "src/ports/*android*",
         "src/ports/*chromium*",
         "src/ports/*fontconfig*",
         "src/ports/*FontConfig*",
         "src/ports/*FreeType*",
         "src/ports/*mozalloc*",
@@ skipping 27 matching lines @@
     ],
 )
 
 SSE4_SRCS = glob(
     [
         "src/opts/*SSE4*.cpp",
         "src/opts/*sse4*.cpp",
     ],
 )
 
+AVX_SRCS = glob(
+    [
+        "src/opts/*_avx.cpp",
+    ],
+)
+
+AVX2_SRCS = glob(
+    [
+        "src/opts/*_avx2.cpp",
+    ],
+)
+
 BASE_HDRS = glob(
     [
         "include/**/*.h",
     ],
     exclude = [
         "include/private/**/*",
 
         # Not used.
         "include/animator/**/*",
         "include/views/**/*",
         "include/xml/SkBML_WXMLParser.h",
         "include/xml/SkBML_XMLParser.h",
     ],
 )
 
 # Dependencies.
 BASE_DEPS_UNIX = [
+    ":opts_avx2",
+    ":opts_avx",
     ":opts_sse4",
     ":opts_ssse3",
 ]
 
 BASE_DEPS_ANDROID = []
 
 BASE_DEPS_IOS = []
 
 BASE_DEPS = select({
     CONDITION_ANDROID: BASE_DEPS_ANDROID + BASE_EXTERNAL_DEPS_ANDROID,
@@ skipping 175 matching lines @@
 
 cc_library(
     name = "opts_sse4",
     srcs = SSE4_SRCS,
     copts = COPTS + ["-msse4"],
     defines = DEFINES,
     includes = INCLUDES,
     deps = EXTERNAL_DEPS_ALL,
 )
 
+cc_library(
+    name = "opts_avx",
+    srcs = AVX_SRCS,
+    copts = COPTS + ["-mavx"],
+    defines = DEFINES,
+    includes = INCLUDES,
+    deps = EXTERNAL_DEPS_ALL,
+)
+
+cc_library(
+    name = "opts_avx2",
+    srcs = AVX2_SRCS,
+    copts = COPTS + ["-mavx2"],
+    defines = DEFINES,
+    includes = INCLUDES,
+    deps = EXTERNAL_DEPS_ALL,
+)
+
 # If you need Ganesh (GPU) support in Skia, please contact skia-team@google.com
 # for help.
 cc_library(
     name = "skia",
     srcs = BASE_SRCS + BASE_SRCS_PLATFORM,
     hdrs = BASE_HDRS,
     copts = COPTS,
     defines = DEFINES,
     includes = INCLUDES,
     linkopts = LINKOPTS,
@@ skipping 15 matching lines @@
         "--images %s/resources" % BASE_DIR,
     ],
     copts = COPTS,
     data = glob(["resources/**/*"]),
     defines = DEFINES,
     includes = DM_INCLUDES,
     deps = DM_EXTERNAL_DEPS + [
         ":skia",
     ] + EXTERNAL_DEPS_ALL,
 )