shill: Disable WiMAX support when built with USE='-gdmwimax -wimax'.
BUG=chromium:313512
CQ-DEPEND=CL:175208,CL:175219,CL:175218,CL:*147371
TEST=Tested the following with lumpy and daisy with a WiMAX module:
1. `USE='gdmwimax wimax' FEATURES=test emerge-$BOARD platform2`
2. `USE='-gdmwimax -wimax' FEATURES=test emerge-$BOARD platform2`
3. When built with WiMAX support, verify that shill detects and supports
the WiMAX module properly. Run network_WiMaxSmoke to confirm.
4. When built without WiMAX support, verify that shill ignores the WiMAX
module.
Change-Id: Ia38f0ac0aa04c06facaf3016716b700efb466976
Reviewed-on: https://chromium-review.googlesource.com/175204
Reviewed-by: Ben Chan <benchan@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>
diff --git a/manager.h b/manager.h
index d268553..c05bc14 100644
--- a/manager.h
+++ b/manager.h
@@ -270,7 +270,9 @@
}
VPNProvider *vpn_provider() const { return vpn_provider_.get(); }
WiFiProvider *wifi_provider() const { return wifi_provider_.get(); }
+#if !defined(DISABLE_WIMAX)
virtual WiMaxProvider *wimax_provider() { return wimax_provider_.get(); }
+#endif // DISABLE_WIMAX
PropertyStore *mutable_store() { return &store_; }
virtual const PropertyStore &store() const { return store_; }
GLib *glib() const { return glib_; }
@@ -530,7 +532,9 @@
scoped_ptr<EthernetEapProvider> ethernet_eap_provider_;
scoped_ptr<VPNProvider> vpn_provider_;
scoped_ptr<WiFiProvider> wifi_provider_;
+#if !defined(DISABLE_WIMAX)
scoped_ptr<WiMaxProvider> wimax_provider_;
+#endif // DISABLE_WIMAX
// Hold pointer to singleton Resolver instance for testing purposes.
Resolver *resolver_;
bool running_;