diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-08-13 12:10:54 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-08-13 12:10:54 +0000 |
| commit | 11285cd0d6ef7de80d22187b99376602ed547214 (patch) | |
| tree | 034c72eea2e7838b08abd00f37acf8e3c9e97949 /hal/moz.build | |
| parent | e1e535c1c6372f95b4a14b6a00b6d6e7be400c3b (diff) | |
| parent | d3383327a749ddb5c0626146c6f83bdfa3ea9936 (diff) | |
| download | UXP-11285cd0d6ef7de80d22187b99376602ed547214.tar UXP-11285cd0d6ef7de80d22187b99376602ed547214.tar.gz UXP-11285cd0d6ef7de80d22187b99376602ed547214.tar.lz UXP-11285cd0d6ef7de80d22187b99376602ed547214.tar.xz UXP-11285cd0d6ef7de80d22187b99376602ed547214.zip | |
Merge branch 'master' into es-modules-work
Diffstat (limited to 'hal/moz.build')
| -rw-r--r-- | hal/moz.build | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/hal/moz.build b/hal/moz.build index a1acfa320..d817e4a01 100644 --- a/hal/moz.build +++ b/hal/moz.build @@ -34,14 +34,6 @@ if CONFIG['OS_TARGET'] == 'Linux': 'linux/LinuxMemory.cpp', 'linux/LinuxPower.cpp', ] - if CONFIG['MOZ_ENABLE_DBUS']: - UNIFIED_SOURCES += [ - 'linux/UPowerClient.cpp', - ] - else: - UNIFIED_SOURCES += [ - 'fallback/FallbackBattery.cpp', - ] elif CONFIG['OS_TARGET'] == 'WINNT': UNIFIED_SOURCES += [ 'fallback/FallbackAlarm.cpp', @@ -51,13 +43,8 @@ elif CONFIG['OS_TARGET'] == 'WINNT': 'fallback/FallbackVibration.cpp', 'windows/WindowsSensor.cpp', ] - # WindowsBattery.cpp cannot be built in unified mode because it relies on HalImpl.h. - SOURCES += [ - 'windows/WindowsBattery.cpp', - ] elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': UNIFIED_SOURCES += [ - 'cocoa/CocoaBattery.cpp', 'fallback/FallbackAlarm.cpp', 'fallback/FallbackMemory.cpp', 'fallback/FallbackPower.cpp', @@ -73,18 +60,9 @@ elif CONFIG['OS_TARGET'] in ('OpenBSD', 'NetBSD', 'FreeBSD', 'DragonFly'): 'fallback/FallbackSensor.cpp', 'fallback/FallbackVibration.cpp', ] - if CONFIG['MOZ_ENABLE_DBUS']: - UNIFIED_SOURCES += [ - 'linux/UPowerClient.cpp', - ] - else: - UNIFIED_SOURCES += [ - 'fallback/FallbackBattery.cpp', - ] else: UNIFIED_SOURCES += [ 'fallback/FallbackAlarm.cpp', - 'fallback/FallbackBattery.cpp', 'fallback/FallbackMemory.cpp', 'fallback/FallbackPower.cpp', 'fallback/FallbackScreenConfiguration.cpp', |