From cfe5ef4ac7cd59f094b538252161ad74223c47da Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Sat, 12 May 2018 11:09:44 +0200 Subject: Remove Gonk build directories --- hal/moz.build | 52 +++++++++++----------------------------------------- 1 file changed, 11 insertions(+), 41 deletions(-) (limited to 'hal/moz.build') diff --git a/hal/moz.build b/hal/moz.build index c17379f22..235994273 100644 --- a/hal/moz.build +++ b/hal/moz.build @@ -45,24 +45,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': SOURCES += [ 'android/AndroidHal.cpp', ] -elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': - UNIFIED_SOURCES += [ - 'gonk/GonkDiskSpaceWatcher.cpp', - 'gonk/GonkSensor.cpp', - 'gonk/GonkSensorsHelpers.cpp', - 'gonk/GonkSensorsInterface.cpp', - 'gonk/GonkSensorsPollInterface.cpp', - 'gonk/GonkSensorsRegistryInterface.cpp', - 'gonk/GonkSwitch.cpp', - 'gonk/SystemService.cpp', - 'gonk/UeventPoller.cpp', - 'linux/LinuxMemory.cpp', - 'linux/LinuxPower.cpp', - ] - # GonkHal.cpp cannot be built in unified mode because it relies on HalImpl.h. - SOURCES += [ - 'gonk/GonkHal.cpp', - ] elif CONFIG['OS_TARGET'] == 'Linux': UNIFIED_SOURCES += [ 'fallback/FallbackAlarm.cpp', @@ -130,19 +112,17 @@ else: 'fallback/FallbackVibration.cpp', ] -# Fallbacks for backends implemented on Gonk only. -if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk': - UNIFIED_SOURCES += [ - 'fallback/FallbackDiskSpaceWatcher.cpp', - 'fallback/FallbackFactoryReset.cpp', - 'fallback/FallbackProcessPriority.cpp', - 'fallback/FallbackScreenPower.cpp', - 'fallback/FallbackSwitch.cpp', - 'fallback/FallbackSystemService.cpp', - 'fallback/FallbackThreadPriority.cpp', - 'fallback/FallbackTime.cpp', - 'fallback/FallbackWakeLocks.cpp', - ] +UNIFIED_SOURCES += [ + 'fallback/FallbackDiskSpaceWatcher.cpp', + 'fallback/FallbackFactoryReset.cpp', + 'fallback/FallbackProcessPriority.cpp', + 'fallback/FallbackScreenPower.cpp', + 'fallback/FallbackSwitch.cpp', + 'fallback/FallbackSystemService.cpp', + 'fallback/FallbackThreadPriority.cpp', + 'fallback/FallbackTime.cpp', + 'fallback/FallbackWakeLocks.cpp', +] # Fallbacks for backends implemented on Android only. if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android': @@ -169,16 +149,6 @@ if CONFIG['MOZ_GAMEPAD']: '/dom/base', ] -if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': - # So that we can call nsScreenManagerGonk::GetConfiguration(). - LOCAL_INCLUDES += [ - '/widget', - '/widget/gonk', - ] - -if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': - LOCAL_INCLUDES += ['%' + '%s/hardware/libhardware_legacy/include' % CONFIG['ANDROID_SOURCE']] - CFLAGS += CONFIG['GLIB_CFLAGS'] CFLAGS += CONFIG['MOZ_DBUS_GLIB_CFLAGS'] CXXFLAGS += CONFIG['GLIB_CFLAGS'] -- cgit v1.2.3