common: remove macro for emulator

emulator macro is changed to is_emulator()

Change-Id: I1a225a22c4dd713233fb83f981402b2e8129b7cf
Signed-off-by: taeyoung <ty317.kim@samsung.com>

diff --git a/src/haptic/emulator.c b/src/haptic/emulator.c
index 3340626..3f9f273 100644 (file)
--- a/src/haptic/emulator.c
+++ b/src/haptic/emulator.c
@@ -174,13 +174,13 @@ static const struct haptic_plugin_ops default_plugin = {
 
 static bool is_valid(void)
 {
-#ifdef EMULATOR
-       _I("Support emulator haptic device");
-       return true;
-#else
+       if (is_emulator()) {
+               _I("Support emulator haptic device");
+               return true;
+       }
+
        _E("Do not support emulator haptic device");
        return false;
-#endif
 }
 
 static const struct haptic_plugin_ops *load(void)

diff --git a/src/power/power-handler.c b/src/power/power-handler.c
index 7e3f180..1541825 100644 (file)
--- a/src/power/power-handler.c
+++ b/src/power/power-handler.c
@@ -294,9 +294,8 @@ static void powerdown(void)
 
        watchdog_notify();
 
-#ifndef EMULATOR
-       unmount_rw_partition();
-#endif
+       if (!is_emulator())
+               unmount_rw_partition();
 }
 
 static void reboot_with_option(int cmd, char *option)