Merge monitor_reconfigure into powerd.

SConstruct

Index: SConstruct
diff --git a/SConstruct b/SConstruct
index c6bef954690949b9ca9b7b527144780803090a2e..d0cc12d2521152a4336689da07828a7a1edfe798 100644
--- a/SConstruct
+++ b/SConstruct
@@ -68,13 +68,15 @@ backlight_controller = gdk_env.Library('backlight_controller',
 power_prefs = gdk_env.Library('power_prefs', ['power_prefs.cc',
                                               'power_constants.cc'])
 powerd_env = xidle_env.Clone()
-powerd_env.Append(LIBS=Split('chromeos crosapi gflags pthread dl metrics'))
+powerd_env.Append(LIBS=Split(
+    'chromeos crosapi gflags pthread dl metrics X11 Xrandr udev'))
 powerd_env.ParseConfig(
   os.environ['PKG_CONFIG'] + ' --cflags --libs dbus-1 dbus-glib-1'
 )
 powerd_sources = Split('''\
   file_tagger.cc power_button_handler.cc powerd.cc powerd_metrics.cc
   screen_locker.cc suspender.cc video_detector.cc metrics_constants.cc
+  monitor_reconfigure.cc resolution_selector.cc udev_listener.cc
 ''')
 util_lib = powerd_env.Library('util_lib', ['util.cc', 'inotify.cc']);
 powerd_lib = powerd_env.Library('powerd_lib', powerd_sources)
@@ -83,6 +85,13 @@ powerd = powerd_env.Program('powerd',
                              power_prefs, backlight_controller, util_lib])
 Default(powerd)
 
+# Build drm tool
+udev = gdk_env.Library('udev_listener', ['udev_listener.cc'])
+udev_env = gdk_env.Clone()
+udev_env.Append(LIBS=Split('base rt pthread gflags X11 Xrandr udev'))
+drm_tool = udev_env.Program('drm-tool', ['drm-tool.cc', udev])
+Default(drm_tool)
+
 # Build privileged power daemon
 powerman_env = gdk_env.Clone()
 powerman_env.Append(LIBS=Split('base chromeos gflags pthread metrics X11'))
@@ -138,4 +147,11 @@ powerman_unittest_env = powerman_env.Clone()
 powerman_unittest_env.Append(LIBS=Split('gtest gmock'))
 deps = [testrunner, 'powerman_unittest.cc', powerman_lib, util_lib, power_prefs]
 tests.append(powerman_unittest_env.Program('powerman_unittest', deps))
+resolution_selector_unittest_env = gdk_env.Clone()
+resolution_selector_unittest_env.Append(LIBS=Split(
+    'base rt gtest pthread gmock'))
+deps = [testrunner, 'resolution_selector_test.cc', backlight_controller,
+        backlight, power_prefs, util_lib]
+tests.append(resolution_selector_unittest_env.Program(
+    'resolution_selector_unittest', deps))
 AlwaysBuild(base_env.Alias('tests', tests))