try harder to exclude SkXbyak.cpp from Google3 build

Change-Id: I26ce450e00b0634deeda61815ef6d501e788c0ae
Reviewed-on: https://skia-review.googlesource.com/6700
Reviewed-by: Mike Klein <mtklein@chromium.org>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
diff --git a/public.bzl b/public.bzl
index 4577ab3..a11bce4 100644
--- a/public.bzl
+++ b/public.bzl
@@ -139,9 +139,6 @@
 
         # Defines main.
         "src/sksl/SkSLMain.cpp",
-
-        # Experiment.  Google3 doesn't have the library it needs.
-        "src/opts/SkXbyak.cpp",
     ],
 )
 
@@ -174,6 +171,8 @@
         "src/opts/SkBitmapProcState_opts_none.cpp",
         "src/opts/SkBlitMask_opts_none.cpp",
         "src/opts/SkBlitRow_opts_none.cpp",
+        # Experiment.  Google3 doesn't have the library it needs.
+        "src/opts/SkXbyak.cpp",
         "src/ports/*CG*",
         "src/ports/*WIC*",
         "src/ports/*android*",
@@ -218,6 +217,8 @@
         "src/opts/*x86*",
         "src/opts/SkBlitMask_opts_none.cpp",
         "src/opts/SkBlitRow_opts_none.cpp",
+        # Experiment.  Google3 doesn't have the library it needs.
+        "src/opts/SkXbyak.cpp",
         "src/ports/*CG*",
         "src/ports/*FontConfig*",
         "src/ports/*WIC*",
@@ -269,6 +270,8 @@
         "src/opts/*x86*",
         "src/opts/SkBlitMask_opts_arm*.cpp",
         "src/opts/SkBlitRow_opts_arm*.cpp",
+        # Experiment.  Google3 doesn't have the library it needs.
+        "src/opts/SkXbyak.cpp",
         "src/ports/*CG*",
         "src/ports/*FontConfig*",
         "src/ports/*FreeType*",