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

Side by Side Diff: build/linux/unbundle/zlib.gn

Issue 2125043002: unbundle: fix build with system zlib (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2016 The Chromium Authors. All rights reserved. 1 # Copyright 2016 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/shim_headers.gni") 5 import("//build/shim_headers.gni")
6 6
7 shim_headers("zlib_shim") { 7 shim_headers("zlib_shim") {
8 root_path = "." 8 root_path = "."
9 headers = [ "zlib.h" ] 9 headers = [ "zlib.h" ]
10 } 10 }
11 11
12 config("system_zlib") {
13 defines = [ "USE_SYSTEM_ZLIB=1" ]
14 }
15
12 source_set("zlib") { 16 source_set("zlib") {
13 deps = [ 17 deps = [
14 ":zlib_shim", 18 ":zlib_shim",
15 ] 19 ]
16 libs = [ "z" ] 20 libs = [ "z" ]
21 public_configs = [ ":system_zlib" ]
17 } 22 }
18 23
19 shim_headers("minizip_shim") { 24 shim_headers("minizip_shim") {
20 root_path = "contrib" 25 root_path = "contrib"
21 headers = [ 26 headers = [
22 "minizip/crypt.h", 27 "minizip/crypt.h",
23 "minizip/ioapi.h", 28 "minizip/ioapi.h",
24 "minizip/iowin32.h", 29 "minizip/iowin32.h",
25 "minizip/mztools.h", 30 "minizip/mztools.h",
26 "minizip/unzip.h", 31 "minizip/unzip.h",
(...skipping 25 matching lines...) Expand all
52 57
53 static_library("compression_utils") { 58 static_library("compression_utils") {
54 sources = [ 59 sources = [
55 "google/compression_utils.cc", 60 "google/compression_utils.cc",
56 "google/compression_utils.h", 61 "google/compression_utils.h",
57 ] 62 ]
58 deps = [ 63 deps = [
59 ":zlib", 64 ":zlib",
60 ] 65 ]
61 } 66 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698