From 3910cbcca364dd96f4fb4a7b0a635c55e17ed695 Mon Sep 17 00:00:00 2001 From: "gs86.lee" Date: Fri, 1 Jul 2016 18:16:26 +0900 Subject: [PATCH] Apply build option naming rule Change-Id: I7342ca488e02ec49124aeae910c600181bbb56e7 --- include/common/lock_mgr.h | 2 +- include/ivi/lock_mgr.h | 2 +- include/mobile/lock_mgr.h | 2 +- packaging/starter.spec | 12 ++++++------ src/common/home_mgr.c | 2 +- src/mobile/home_mgr.c | 4 ++-- src/mobile/starter.c | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/common/lock_mgr.h b/include/common/lock_mgr.h index 6db7a69..e581f77 100644 --- a/include/common/lock_mgr.h +++ b/include/common/lock_mgr.h @@ -25,7 +25,7 @@ #define _EDJ(x) elm_layout_edje_get(x) -#ifdef TIZEN_BUILD_EMULATOR +#ifdef TIZEN_ARCH_EMULATOR #define LOCK_MGR_DEFAULT_BG_PATH "/opt/share/settings/Wallpapers/Default.jpg" #else #define LOCK_MGR_DEFAULT_BG_PATH "/opt/share/settings/Wallpapers/Lock_default.png" diff --git a/include/ivi/lock_mgr.h b/include/ivi/lock_mgr.h index 6db7a69..e581f77 100644 --- a/include/ivi/lock_mgr.h +++ b/include/ivi/lock_mgr.h @@ -25,7 +25,7 @@ #define _EDJ(x) elm_layout_edje_get(x) -#ifdef TIZEN_BUILD_EMULATOR +#ifdef TIZEN_ARCH_EMULATOR #define LOCK_MGR_DEFAULT_BG_PATH "/opt/share/settings/Wallpapers/Default.jpg" #else #define LOCK_MGR_DEFAULT_BG_PATH "/opt/share/settings/Wallpapers/Lock_default.png" diff --git a/include/mobile/lock_mgr.h b/include/mobile/lock_mgr.h index 21d0b95..f54bd98 100644 --- a/include/mobile/lock_mgr.h +++ b/include/mobile/lock_mgr.h @@ -25,7 +25,7 @@ #define _EDJ(x) elm_layout_edje_get(x) -#ifdef TIZEN_BUILD_EMULATOR +#ifdef TIZEN_ARCH_EMULATOR #define LOCK_MGR_DEFAULT_BG_PATH "/opt/share/settings/Wallpapers/Default.jpg" #else #define LOCK_MGR_DEFAULT_BG_PATH "/opt/share/settings/Wallpapers/Lock_default.png" diff --git a/packaging/starter.spec b/packaging/starter.spec index c130646..020b5c5 100644 --- a/packaging/starter.spec +++ b/packaging/starter.spec @@ -114,16 +114,16 @@ export CXXFLAGS="$CXXFLAGS -DTIZEN_PROFILE_IVI" %endif %ifarch %{arm} -export CFLAGS="$CFLAGS -DTIZEN_BUILD_TARGET" -export CXXFLAGS="$CXXFLAGS -DTIZEN_BUILD_TARGET" +export CFLAGS="$CFLAGS -DTIZEN_ARCH_ARM" +export CXXFLAGS="$CXXFLAGS -DTIZEN_ARCH_ARM" %else -export CFLAGS="$CFLAGS -DTIZEN_BUILD_EMULATOR" -export CXXFLAGS="$CXXFLAGS -DTIZEN_BUILD_EMULATOR" +export CFLAGS="$CFLAGS -DTIZEN_ARCH_EMULATOR" +export CXXFLAGS="$CXXFLAGS -DTIZEN_ARHC_EMULATOR" %endif %ifarch aarch64 -export CFLAGS="$CFLAGS -DTIZEN_BUILD_TARGET_64" -export CXXFLAGS="$CXXFLAGS -DTIZEN_BUILD_TARGET_64" +export CFLAGS="$CFLAGS -DTIZEN_ARCH_ARM64" +export CXXFLAGS="$CXXFLAGS -DTIZEN_ARCH_ARM64" %endif %if %{with wayland} diff --git a/src/common/home_mgr.c b/src/common/home_mgr.c index cccdedc..939659d 100644 --- a/src/common/home_mgr.c +++ b/src/common/home_mgr.c @@ -112,7 +112,7 @@ void home_mgr_open_home(const char *appid, const char *key, const char *val) { char *home_appid = NULL; -#ifndef TIZEN_BUILD_TARGET_64 +#ifndef TIZEN_ARCH_ARM64 if (!appid) { home_appid = status_active_get()->setappl_selected_package_name; } else { diff --git a/src/mobile/home_mgr.c b/src/mobile/home_mgr.c index 45e391a..9bb02c7 100644 --- a/src/mobile/home_mgr.c +++ b/src/mobile/home_mgr.c @@ -130,7 +130,7 @@ void home_mgr_open_home(const char *appid, const char *key, const char *val) { char *home_appid = NULL; -#ifndef TIZEN_BUILD_TARGET_64 +#ifndef TIZEN_ARCH_ARM64 if (!appid) { home_appid = status_active_get()->setappl_selected_package_name; } else { @@ -445,7 +445,7 @@ static int _power_off_cb(status_active_key_e key, void *data) static Eina_Bool _launch_apps_idler_cb(void *data) { -#ifndef TIZEN_BUILD_TARGET_64 +#ifndef TIZEN_ARCH_ARM64 process_mgr_must_syspopup_launch(SYSPOPUPID_VOLUME, NULL, NULL, NULL, _after_launch_volume); process_mgr_must_launch(APPID_INDICATOR, NULL, NULL, NULL, _after_launch_indicator); process_mgr_must_launch(APPID_QUICKPANEL, NULL, NULL, NULL, _after_launch_quickpanel); diff --git a/src/mobile/starter.c b/src/mobile/starter.c index 818eeb5..8a3dbc6 100755 --- a/src/mobile/starter.c +++ b/src/mobile/starter.c @@ -145,7 +145,7 @@ static int _set_i18n(const char *domain, const char *dir) static int _check_dead_signal(int pid, void *data) { -#ifndef TIZEN_BUILD_TARGET_64 +#ifndef TIZEN_ARCH_ARM64 int home_pid = 0; int volume_pid = 0; int indicator_pid = 0; -- 2.7.4