Remove enable_nacl check in liblouis build

Change-Id: I38fe82a03cd47eb80f9e812ca090361a94e603e3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1623555
Commit-Queue: David Tseng <dtseng@chromium.org>
Reviewed-by: Chris Hall <chrishall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#662276}

chrome/browser/resources/chromeos/chromevox/BUILD.gn

@@ -6,7 +6,6 @@ import("//build/config/features.gni")
 import("//chrome/common/features.gni")
 import("//chrome/test/base/js2gtest.gni")
 import("//chromecast/chromecast.gni")
-import("//components/nacl/features.gni")
 import("//testing/test.gni")
 import("//third_party/closure_compiler/compile_js.gni")
 import("run_jsbundler.gni")
@@ -231,10 +230,8 @@ group("chromevox") {
     "//chrome/browser/resources/chromeos/braille_ime:braille_ime_manifest",
     "//chrome/browser/resources/chromeos/chromevox/strings:chromevox_strings",
     "//third_party/chromevox:chromevox_third_party_resources",
+    "//third_party/liblouis",
   ]
-  if (enable_nacl) {
-    deps += [ "//third_party/liblouis" ]
-  }
   if (chromevox_compress_js) {
     deps += [
       ":chromevox_background_script",

third_party/liblouis/BUILD.gn

@@ -2,69 +2,68 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/nacl/config.gni")
-import("//build/config/nacl/rules.gni")
+import("//chromecast/chromecast.gni")
 
-if (current_toolchain == default_toolchain) {
-  chromevox_test_data_dir = "$root_build_dir/chromevox_test_data/braille"
+chromevox_test_data_dir = "$root_build_dir/chromevox_test_data/braille"
 
-  # Build Liblouis library
-  #
-  # This target is used to build and assemble Liblouis braille translator.
-  #
-  # Variables:
-  #   dest_dir: destination path for all translator files
-  #   deps: private linked dependencies
-  #   testonly: a target must only be used for testing
-  template("liblouis_library") {
-    assert(defined(invoker.dest_dir), "Must define dest_dir")
-    forward_variables_from(invoker, [ "dest_dir" ])
+# Build Liblouis library
+#
+# This target is used to build and assemble Liblouis braille translator.
+#
+# Variables:
+#   dest_dir: destination path for all translator files
+#   deps: private linked dependencies
+#   testonly: a target must only be used for testing
+template("liblouis_library") {
+  assert(defined(invoker.dest_dir), "Must define dest_dir")
+  forward_variables_from(invoker, [ "dest_dir" ])
 
-    tables_json_target_name = "${target_name}_tables_json"
-    wasm_target_name = "${target_name}_wasm"
-    final_target_name = target_name
+  tables_json_target_name = "${target_name}_tables_json"
+  wasm_target_name = "${target_name}_wasm"
+  final_target_name = target_name
 
-    copy(tables_json_target_name) {
-      forward_variables_from(invoker, [ "testonly" ])
-      visibility = [ ":$final_target_name" ]
-      sources = [
-        "tables.json",
-      ]
-      outputs = [
-        "$dest_dir/{{source_file_part}}",
-      ]
-    }
+  copy(tables_json_target_name) {
+    forward_variables_from(invoker, [ "testonly" ])
+    visibility = [ ":$final_target_name" ]
+    sources = [
+      "tables.json",
+    ]
+    outputs = [
+      "$dest_dir/{{source_file_part}}",
+    ]
+  }
 
-    copy(wasm_target_name) {
-      forward_variables_from(invoker, [ "testonly" ])
-      visibility = [ ":$final_target_name" ]
-      sources = [
-        "wasm/liblouis_wasm.data",
-        "wasm/liblouis_wasm.js",
-        "wasm/liblouis_wasm.wasm",
-        "wasm/liblouis_wrapper.js",
-      ]
-      outputs = [
-        "$dest_dir/{{source_file_part}}",
-      ]
-    }
+  copy(wasm_target_name) {
+    forward_variables_from(invoker, [ "testonly" ])
+    visibility = [ ":$final_target_name" ]
+    sources = [
+      "wasm/liblouis_wasm.data",
+      "wasm/liblouis_wasm.js",
+      "wasm/liblouis_wasm.wasm",
+      "wasm/liblouis_wrapper.js",
+    ]
+    outputs = [
+      "$dest_dir/{{source_file_part}}",
+    ]
+  }
 
-    group(target_name) {
-      forward_variables_from(invoker, [ "testonly" ])
-      deps = [
-        ":$tables_json_target_name",
-        ":$wasm_target_name",
-      ]
-      if (defined(invoker.deps)) {
-        deps += invoker.deps
-      }
+  group(target_name) {
+    forward_variables_from(invoker, [ "testonly" ])
+    deps = [
+      ":$tables_json_target_name",
+      ":$wasm_target_name",
+    ]
+    if (defined(invoker.deps)) {
+      deps += invoker.deps
     }
   }
+}
 
-  liblouis_library("liblouis") {
-    dest_dir = "$root_build_dir/resources/chromeos/chromevox/braille"
-  }
+liblouis_library("liblouis") {
+  dest_dir = "$root_build_dir/resources/chromeos/chromevox/braille"
+}
 
+if (!is_chromecast) {
   liblouis_library("liblouis_test_data") {
     testonly = true
     dest_dir = chromevox_test_data_dir