Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(58)

Unified Diff: tools/gn/secondary/third_party/libxml/BUILD.gn

Issue 156563002: Redefine is_linux to not include Android in the GN build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/gn/secondary/skia/BUILD.gn ('k') | tools/gn/secondary/ui/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gn/secondary/third_party/libxml/BUILD.gn
diff --git a/tools/gn/secondary/third_party/libxml/BUILD.gn b/tools/gn/secondary/third_party/libxml/BUILD.gn
index 96024eabcd67db87fb225257f16d542b5aa35ca5..aa6936e9f18557754a28a9eefe12016c4e1a140c 100644
--- a/tools/gn/secondary/third_party/libxml/BUILD.gn
+++ b/tools/gn/secondary/third_party/libxml/BUILD.gn
@@ -4,7 +4,7 @@
# Define an "os_include" variable that points at the OS-specific generated
# headers. These were generated by running the configure script offline.
-if (is_linux) {
+if (is_linux || is_android) {
os_include = "linux"
} else if (is_mac || is_ios) {
os_include = "mac"
@@ -155,9 +155,6 @@ static_library("libxml") {
cflags_c = [
"/wd4101", # Unreferenced local variable.
]
- } else if (is_linux) {
- # We need dl for dlopen() and friends.
- libs = [ "dl" ]
} else if (is_mac || is_android) {
# http://www.xmlsoft.org/threads.html says that this is required when using
# libxml from several threads, which can possibly happen in chrome. On
« no previous file with comments | « tools/gn/secondary/skia/BUILD.gn ('k') | tools/gn/secondary/ui/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698