Merge ~abreu-alexandre/oxide:fix-non-mh-build into oxide:master

Proposed by Alexandre Abreu
Status: Merged
Approved by: Chris Coulson
Approved revision: 50a3ac0ecd3caf643f31920a2fdd0292afcf0118
Merged at revision: 50a3ac0ecd3caf643f31920a2fdd0292afcf0118
Proposed branch: ~abreu-alexandre/oxide:fix-non-mh-build
Merge into: oxide:master
Diff against target: 29 lines (+10/-8)
1 file modified
shared/BUILD.gn (+10/-8)
Reviewer Review Type Date Requested Status
Chris Coulson Approve
Review via email: mp+299097@code.launchpad.net

Commit message

Fix non media hub build: mediahub_shim source_set conditionally considered.

Description of the change

For non media hub build, it seems that eventhough the source_set for mediahub_shim is only a dep if enable_mediahub is set, it is still being considered along its chain of dependencies,

To post a comment you must log in.
Revision history for this message
Chris Coulson (chrisccoulson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/shared/BUILD.gn b/shared/BUILD.gn
2index b9675b8..0239707 100644
3--- a/shared/BUILD.gn
4+++ b/shared/BUILD.gn
5@@ -116,14 +116,16 @@ version_header("chrome_version") {
6 output_file = "$target_gen_dir/common/chrome_version.h"
7 }
8
9-source_set("mediahub_shim") {
10- configs -= [ "//build/config/gcc:no_exceptions" ]
11- configs += [ "//oxide/build/config/linux:media_hub_client" ]
12-
13- sources = [
14- "browser/media/mediahub_player_shim.cc",
15- "browser/media/mediahub_player_shim.h"
16- ]
17+if (enable_mediahub) {
18+ source_set("mediahub_shim") {
19+ configs -= [ "//build/config/gcc:no_exceptions" ]
20+ configs += [ "//oxide/build/config/linux:media_hub_client" ]
21+
22+ sources = [
23+ "browser/media/mediahub_player_shim.cc",
24+ "browser/media/mediahub_player_shim.h"
25+ ]
26+ }
27 }
28
29 component("shared") {

Subscribers

People subscribed via source and target branches