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

Unified Diff: tools/gn/secondary/crypto/ssl/BUILD.gn

Issue 109443004: Separate out pkg-config execution in the GN build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 | « build/config/linux/pkg_config.gni ('k') | tools/gn/secondary/third_party/nss/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gn/secondary/crypto/ssl/BUILD.gn
diff --git a/tools/gn/secondary/crypto/ssl/BUILD.gn b/tools/gn/secondary/crypto/ssl/BUILD.gn
index 461176d21d937b150e25555fc6aa5ca059f7ce52..dc78efc710db04ad89aeae3cc24b22d2a5d9da48 100644
--- a/tools/gn/secondary/crypto/ssl/BUILD.gn
+++ b/tools/gn/secondary/crypto/ssl/BUILD.gn
@@ -3,6 +3,7 @@
# found in the LICENSE file.
import("flags.gni")
+import("//build/config/linux/pkg_config.gni")
config("ssl_preprocessor_flags") {
if (use_openssl) {
@@ -14,14 +15,9 @@ config("ssl_preprocessor_flags") {
# Config for system SSL on Linux.
if (is_linux && use_system_ssl) {
- pkg_script = "//build/config/linux/pkg-config.py"
- config("system_ssl_config") {
+ pkg_config("system_ssl_config") {
+ packages = [ "nss" ]
defines = [ "USE_SYSTEM_SSL" ]
- pkgresult = exec_script(pkg_script, [ "nss" ], "value")
- include_dirs = pkgresult[0]
- cflags = pkgresult[1]
- libs = pkgresult[2]
- lib_dirs = pkgresult[3]
}
}
« no previous file with comments | « build/config/linux/pkg_config.gni ('k') | tools/gn/secondary/third_party/nss/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698