commit 59b160f99106e39ede726b7a7b4be108a0caa7a6
author Nathaniel Nifong <nifong@google.com> Sat Feb 29 02:49:41 2020 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Sat Feb 29 02:49:59 2020 +0000
tree aa14592a85f04d99bc330096f8c51c9a64753fe8
parent 55607b14342f82451e9f054d3765cb19967de42d

Can't submit bzl change adding extra arg to skia_select without google3 BUILD rules using it correctly.

Revert "Add WASM os target to public.bzl"

This reverts commit 83346185bec595457e37c9817512dbd19a6fb4b9.

Reason for revert: <INSERT REASONING HERE>

Original change's description:
> Add WASM os target to public.bzl
> 
> prerequisite to cl/297131877
> 
> Bug: b/150386856
> Change-Id: I23a770c59ca7c2899ef5e045194a1bf9c27d9449
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/274048
> Commit-Queue: Nathaniel Nifong <nifong@google.com>
> Reviewed-by: Kevin Lubick <kjlubick@google.com>

TBR=kjlubick@google.com,nifong@google.com

Change-Id: I85719313a17c500220edc3ad6e1ead0d5cf8a363
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: b/150386856
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/274268
Reviewed-by: Nathaniel Nifong <nifong@google.com>
Commit-Queue: Nathaniel Nifong <nifong@google.com>

public.bzl

diff --git a/public.bzl b/public.bzl
index 4b01bb8..3f871ab 100644
--- a/public.bzl
+++ b/public.bzl
@@ -20,19 +20,19 @@
         return select(select_dict)
 
 def skia_select(conditions, results):
-    """Replaces select() for conditions [UNIX, ANDROID, IOS, WASM]
+    """Replaces select() for conditions [UNIX, ANDROID, IOS]
 
     Args:
-      conditions: [CONDITION_UNIX, CONDITION_ANDROID, CONDITION_IOS, CONDITION_WASM]
-      results: [RESULT_UNIX, RESULT_ANDROID, RESULT_IOS, RESULT_WASM]
+      conditions: [CONDITION_UNIX, CONDITION_ANDROID, CONDITION_IOS]
+      results: [RESULT_UNIX, RESULT_ANDROID, RESULT_IOS]
     Returns:
       The result matching the platform condition.
     """
-    if len(conditions) != 4 or len(results) != 4:
-        fail("Must provide exactly 4 conditions and 4 results")
+    if len(conditions) != 3 or len(results) != 3:
+        fail("Must provide exactly 3 conditions and 3 results")
 
     selector = {}
-    for i in range(4):
+    for i in range(3):
         selector[conditions[i]] = results[i]
     return portable_select(selector, conditions[2], conditions[0])
 
@@ -378,44 +378,6 @@
     ],
 )
 
-GL_SRCS_WASM = struct(
-    include = [
-        "src/gpu/gl/GrGLMakeNativeInterface_egl.cpp",
-        "src/gpu/gl/egl/GrGLMakeNativeInterface_egl.cpp",
-    ],
-    exclude = [],
-)
-PORTS_SRCS_WASM = struct(
-    include = [
-        "src/ports/**/*.cpp",
-        "src/ports/**/*.h",
-    ],
-    exclude = [
-        "src/ports/*FontConfig*",
-        "src/ports/*FreeType*",
-        "src/ports/*WIC*",
-        "src/ports/*CG*",
-        "src/ports/*android*",
-        "src/ports/*chromium*",
-        "src/ports/*fontconfig*",
-        "src/ports/*mac*",
-        "src/ports/*mozalloc*",
-        "src/ports/*nacl*",
-        "src/ports/*win*",
-        "src/ports/SkFontMgr_custom.cpp",
-        "src/ports/SkFontMgr_custom_directory.cpp",
-        "src/ports/SkFontMgr_custom_directory_factory.cpp",
-        "src/ports/SkFontMgr_custom_embedded.cpp",
-        "src/ports/SkFontMgr_custom_embedded_factory.cpp",
-        "src/ports/SkFontMgr_custom_empty.cpp",
-        "src/ports/SkFontMgr_custom_empty_factory.cpp",
-        "src/ports/SkFontMgr_fontconfig_factory.cpp",
-        "src/ports/SkFontMgr_fuchsia.cpp",
-        "src/ports/SkImageGenerator_none.cpp",
-        "src/ports/SkTLS_none.cpp",
-    ]
-)
-
 def base_srcs():
     return skia_glob(BASE_SRCS_ALL)
 
@@ -426,7 +388,6 @@
             skia_glob(PORTS_SRCS_UNIX),
             skia_glob(PORTS_SRCS_ANDROID),
             skia_glob(PORTS_SRCS_IOS),
-            skia_glob(PORTS_SRCS_WASM),
         ],
     )
 
@@ -437,7 +398,6 @@
             skia_glob(GL_SRCS_UNIX),
             skia_glob(GL_SRCS_ANDROID),
             skia_glob(GL_SRCS_IOS),
-            skia_glob(GL_SRCS_WASM),
         ],
     )
 
@@ -602,7 +562,6 @@
             ["tests/FontMgrFontConfigTest.cpp"],
             ["tests/FontMgrAndroidParserTest.cpp"],
             [],
-            [],
         ],
     )
 
@@ -646,10 +605,6 @@
             [
                 "-Wno-implicit-fallthrough",  # Some intentional fallthrough.
             ],
-            # WASM
-            [
-                "-Wno-implicit-fallthrough",  # Some intentional fallthrough.
-            ],
         ],
     )
 
@@ -699,17 +654,6 @@
                 "SK_BUILD_NO_OPTS",
                 "SKNX_NO_SIMD",
             ],
-            # WASM
-            [
-                "SK_DISABLE_LEGACY_SHADERCONTEXT",
-                "SK_DISABLE_TRACING",
-                "GR_GL_CHECK_ALLOC_WITH_GET_ERROR=0",
-                "SK_SUPPORT_GPU=1",
-                "SK_DISABLE_AAA",
-                "SK_DISABLE_EFFECT_DESERIALIZATION",
-                "SK_FORCE_8_BYTE_ALIGNMENT",
-                "SKNX_NO_SIMD",
-            ],
         ],
     )
 
@@ -739,9 +683,6 @@
                 "-framework MobileCoreServices",
             ],
         ],
-        # WASM # these are very specific to the target being built, you'll find them in
-        # google3/third_party/skia/HEAD/modules/canvaskit/BUILD
-        [],
     )
 
 ################################################################################