Commit 852f7188 authored by ccameron@chromium.org's avatar ccameron@chromium.org

Revert 275819 "Add libxslt to the GN build"

This is causing compile failure on the Android build:
http://build.chromium.org/p/chromium.linux/buildstatus?builder=Android%20GN&number=3401

> Add libxslt to the GN build
> 
> BUG=
> R=scottmg@chromium.org
> 
> Review URL: https://codereview.chromium.org/317253003

TBR=brettw@chromium.org

Review URL: https://codereview.chromium.org/320293003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275822 0039d316-1c4b-4281-b951-d872f2087c98
parent f99d54c5
...@@ -64,7 +64,6 @@ group("root") { ...@@ -64,7 +64,6 @@ group("root") {
"//third_party/libusb", "//third_party/libusb",
"//third_party/libwebm", "//third_party/libwebm",
"//third_party/libwebp", "//third_party/libwebp",
"//third_party/libxslt",
"//third_party/libyuv", "//third_party/libyuv",
"//third_party/mesa", "//third_party/mesa",
"//third_party/ots", "//third_party/ots",
......
...@@ -1086,11 +1086,10 @@ test("net_unittests") { ...@@ -1086,11 +1086,10 @@ test("net_unittests") {
} }
if (!use_nss_certs) { if (!use_nss_certs) {
sources -= [ "ssl/client_cert_store_nss_unittest.cc" ] sources -= [
if (is_chromeos) { "ssl/client_cert_store_nss_unittest.cc",
# Will have already have been removed in the ChromeOS case. "ssl/client_cert_store_chromeos_unittest.cc",
sources -= [ "ssl/client_cert_store_chromeos_unittest.cc" ] ]
}
} }
if (use_openssl) { if (use_openssl) {
......
# Copyright 2014 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
config("libxslt_config") {
defines = [ "LIBXSLT_STATIC" ]
include_dirs = [ "." ]
}
static_library("libxslt") {
sources = [
"libxslt/attributes.c",
"libxslt/attributes.h",
"libxslt/attrvt.c",
"libxslt/documents.c",
"libxslt/documents.h",
"libxslt/extensions.c",
"libxslt/extensions.h",
"libxslt/extra.c",
"libxslt/extra.h",
"libxslt/functions.c",
"libxslt/functions.h",
"libxslt/imports.c",
"libxslt/imports.h",
"libxslt/keys.c",
"libxslt/keys.h",
"libxslt/libxslt.h",
"libxslt/namespaces.c",
"libxslt/namespaces.h",
"libxslt/numbers.c",
"libxslt/numbersInternals.h",
"libxslt/pattern.c",
"libxslt/pattern.h",
"libxslt/preproc.c",
"libxslt/preproc.h",
"libxslt/security.c",
"libxslt/security.h",
"libxslt/templates.c",
"libxslt/templates.h",
"libxslt/transform.c",
"libxslt/transform.h",
"libxslt/trio.h",
"libxslt/triodef.h",
"libxslt/variables.c",
"libxslt/variables.h",
"libxslt/win32config.h",
"libxslt/xslt.c",
"libxslt/xslt.h",
"libxslt/xsltconfig.h",
"libxslt/xsltexports.h",
"libxslt/xsltInternals.h",
"libxslt/xsltlocale.c",
"libxslt/xsltlocale.h",
"libxslt/xsltutils.c",
"libxslt/xsltutils.h",
"libxslt/xsltwin32config.h",
"linux/config.h",
"mac/config.h",
]
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
direct_dependent_configs = [ ":libxslt_config" ]
if (is_linux) {
include_dirs = [ "linux" ]
} else if (is_win) {
include_dirs = [ "win32" ]
} else if (is_mac) {
include_dits = [ "mac" ]
}
if (is_clang) {
cflags = [ "-Wno-pointer-sign" ]
}
deps = [
"//third_party/libxml",
]
}
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