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

Unified Diff: media/audio/BUILD.gn

Issue 1467843002: top-level-ize gn's pkg_config in audio/BUILD.gn (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review nit Created 5 years, 1 month 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/BUILD.gn
diff --git a/media/audio/BUILD.gn b/media/audio/BUILD.gn
index eb9129a881cfb98b9047a9a5f6361b0d0908922a..2323d47a89c877063b2daa9f384b4c1b7e252686 100644
--- a/media/audio/BUILD.gn
+++ b/media/audio/BUILD.gn
@@ -214,10 +214,6 @@ source_set("audio") {
"cras/cras_unified.cc",
"cras/cras_unified.h",
]
-
- pkg_config("libcras") {
- packages = [ "libcras" ]
- }
configs += [ ":libcras" ]
deps += [ "//chromeos:chromeos" ]
}
@@ -235,9 +231,6 @@ source_set("audio") {
]
if (link_pulseaudio) {
- pkg_config("libpulse") {
- packages = [ "libpulse" ]
- }
configs += [ ":libpulse" ]
} else {
# TODO(ajwong): Technically, this dl should go in the action.
@@ -250,6 +243,18 @@ source_set("audio") {
configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
}
+if (use_cras) {
+ pkg_config("libcras") {
+ packages = [ "libcras" ]
+ }
+}
+
+if (use_pulseaudio && link_pulseaudio) {
+ pkg_config("libpulse") {
+ packages = [ "libpulse" ]
+ }
+}
+
source_set("test_support") {
testonly = true
sources = [
« 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