Commit 817019ee authored by David Tseng's avatar David Tseng Committed by Commit Bot

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: default avatarChris Hall <chrishall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#662276}
parent f335140f
...@@ -6,7 +6,6 @@ import("//build/config/features.gni") ...@@ -6,7 +6,6 @@ import("//build/config/features.gni")
import("//chrome/common/features.gni") import("//chrome/common/features.gni")
import("//chrome/test/base/js2gtest.gni") import("//chrome/test/base/js2gtest.gni")
import("//chromecast/chromecast.gni") import("//chromecast/chromecast.gni")
import("//components/nacl/features.gni")
import("//testing/test.gni") import("//testing/test.gni")
import("//third_party/closure_compiler/compile_js.gni") import("//third_party/closure_compiler/compile_js.gni")
import("run_jsbundler.gni") import("run_jsbundler.gni")
...@@ -231,10 +230,8 @@ group("chromevox") { ...@@ -231,10 +230,8 @@ group("chromevox") {
"//chrome/browser/resources/chromeos/braille_ime:braille_ime_manifest", "//chrome/browser/resources/chromeos/braille_ime:braille_ime_manifest",
"//chrome/browser/resources/chromeos/chromevox/strings:chromevox_strings", "//chrome/browser/resources/chromeos/chromevox/strings:chromevox_strings",
"//third_party/chromevox:chromevox_third_party_resources", "//third_party/chromevox:chromevox_third_party_resources",
"//third_party/liblouis",
] ]
if (enable_nacl) {
deps += [ "//third_party/liblouis" ]
}
if (chromevox_compress_js) { if (chromevox_compress_js) {
deps += [ deps += [
":chromevox_background_script", ":chromevox_background_script",
......
...@@ -2,21 +2,19 @@ ...@@ -2,21 +2,19 @@
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
import("//build/config/nacl/config.gni") import("//chromecast/chromecast.gni")
import("//build/config/nacl/rules.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 # Build Liblouis library
# #
# This target is used to build and assemble Liblouis braille translator. # This target is used to build and assemble Liblouis braille translator.
# #
# Variables: # Variables:
# dest_dir: destination path for all translator files # dest_dir: destination path for all translator files
# deps: private linked dependencies # deps: private linked dependencies
# testonly: a target must only be used for testing # testonly: a target must only be used for testing
template("liblouis_library") { template("liblouis_library") {
assert(defined(invoker.dest_dir), "Must define dest_dir") assert(defined(invoker.dest_dir), "Must define dest_dir")
forward_variables_from(invoker, [ "dest_dir" ]) forward_variables_from(invoker, [ "dest_dir" ])
...@@ -59,12 +57,13 @@ if (current_toolchain == default_toolchain) { ...@@ -59,12 +57,13 @@ if (current_toolchain == default_toolchain) {
deps += invoker.deps deps += invoker.deps
} }
} }
} }
liblouis_library("liblouis") { liblouis_library("liblouis") {
dest_dir = "$root_build_dir/resources/chromeos/chromevox/braille" dest_dir = "$root_build_dir/resources/chromeos/chromevox/braille"
} }
if (!is_chromecast) {
liblouis_library("liblouis_test_data") { liblouis_library("liblouis_test_data") {
testonly = true testonly = true
dest_dir = chromevox_test_data_dir dest_dir = chromevox_test_data_dir
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment