From: Denis Dolzhenko <d.dolzhenko@samsung.com>
Date: Mon, 20 Feb 2017 14:46:09 +0000 (+0200)
Subject: TizenRefApp-8051 Fix ABS build for tizen 4.0
X-Git-Tag: submit/tizen/20170220.160759^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3752ba8bedf19ad72ac1cb15d6e9fe0660a1680c;p=profile%2Fmobile%2Fapps%2Fnative%2Fmessage.git

TizenRefApp-8051 Fix ABS build for tizen 4.0

Change-Id: I24b8cc670df1bf1f34844363531aa3148e4f2c9d
Signed-off-by: Denis Dolzhenko <d.dolzhenko@samsung.com>
---

diff --git a/Build/basedef.mk b/Build/basedef.mk
index 64fbf82b..a7629830 100644
--- a/Build/basedef.mk
+++ b/Build/basedef.mk
@@ -22,7 +22,7 @@ PROJ_PATH ?= $(PROJPATH)
 #endif
 
 #ifeq ($(strip $(OUTPUT_DIR)),)
-OUTPUT_DIR ?= $(PROJ_PATH)/$(BUILD_CONFIG)
+#OUTPUT_DIR ?= $(PROJ_PATH)/$(BUILD_CONFIG)
 #endif
 
 #ifeq ($(strip $(BUILD_ARCH)),)
diff --git a/Build/funcs.mk b/Build/funcs.mk
index 8297d180..3ba778b3 100644
--- a/Build/funcs.mk
+++ b/Build/funcs.mk
@@ -45,6 +45,6 @@ CONVERT_4MAKE_TO_OUT = $(subst $(DOTDOT),$(DOTDOT_OUT),$(subst $(COLON),$(COLON_
 PROC_NO_EXIST = $(if $(wildcard $(1)),,$(call $(2),$(1)))
 define MAKEDIRS0
 	@echo '  Building directory: $(1)'
-	@$(MKDIR) $(MKDIR_OP) $(subst $(BSLASH),/,$(1))	
+	@$(MKDIR) $(MKDIR_OP) $(subst $(BSLASH),/,$(1))
 endef
 MAKEDIRS = $(call PROC_NO_EXIST,$(1),MAKEDIRS0)
diff --git a/Build/makefile b/Build/makefile
index 9348c50a..f491b50b 100644
--- a/Build/makefile
+++ b/Build/makefile
@@ -24,7 +24,7 @@ endif
 
 app_build :
 	@echo $(MAKE) -f "$(BUILD_ROOT)/makefile.mk"
-	@$(MAKE) -f "$(BUILD_ROOT)/makefile.mk" -C "$(PROJ_PATH)" $(OPTIONS)
+	@$(MAKE_BIN) -f "$(BUILD_ROOT)/makefile.mk" -C "$(PROJ_PATH)" $(OPTIONS)
 
 app_clean :
 	@$(MAKE) -f "$(BUILD_ROOT)/makefile.mk" -C "$(PROJ_PATH)" $(OPTIONS) clean
diff --git a/Build/makefile.mk b/Build/makefile.mk
index c95b4b40..205a3ad3 100644
--- a/Build/makefile.mk
+++ b/Build/makefile.mk
@@ -65,8 +65,8 @@ ifeq ($(strip $(APPTYPE)),sharedLib)
 EXT_OP := -fPIC
 endif
 
-C_OPT := $(COMPILE_FLAGS) $(TC_COMPILER_MISC) $(RS_COMPILER_MISC) $(EXT_OP) --sysroot="$(SYSROOT)" -Werror-implicit-function-declaration $(M_OPT)
-CPP_OPT := $(CPP_COMPILE_FLAGS) $(TC_COMPILER_MISC) $(RS_COMPILER_MISC) $(EXT_OP) --sysroot="$(SYSROOT)" -Werror-implicit-function-declaration $(M_OPT)
+C_OPT := $(COMPILE_FLAGS) $(TC_COMPILER_MISC) $(RS_COMPILER_MISC) $(EXT_OP) --sysroot="$(SYSROOT)" -Werror-implicit-function-declaration $(M_OPT) $(USER_C_OPTS)
+CPP_OPT := $(CPP_COMPILE_FLAGS) $(TC_COMPILER_MISC) $(RS_COMPILER_MISC) $(EXT_OP) --sysroot="$(SYSROOT)" -Werror-implicit-function-declaration $(M_OPT) $(USER_CPP_OPTS)
 C_OPT_FILE := $(PLATFORM_INCS_FILE)
 
 OBJS := #
@@ -81,7 +81,7 @@ $(foreach ext,cpp cxx cc c++ C,$(eval $(call C_PROC_RAW,$(OBJ_OUTPUT),$(USER_SRC
 # Individual C/C++
 ifneq ($(strip $(USER_EXT_C_KEYS)),)
 $(foreach var,$(USER_EXT_C_KEYS),$(eval $(call C_PROC_RAW,$(OBJ_OUTPUT),$(USER_EXT_$(var)_SRCS),$(USER_EXT_$(var)_INC_DIRS),$(USER_EXT_$(var)_INC_FILES),$(USER_EXT_$(var)_DEFS),$(USER_EXT_$(var)_UNDEFS),$(C_OPT),$(C_OPT_FILE),C,c,$(CC),OBJS)))
-$(foreach ext,cpp cxx cc c++ C,$(foreach var,$(USER_EXT_C_KEYS),$(eval $(call C_PROC_RAW,$(OBJ_OUTPUT),$(USER_EXT_$(var)_SRCS),$(USER_EXT_$(var)_INC_DIRS),$(USER_EXT_$(var)_CPP_INC_FILES),$(USER_EXT_$(var)_CPP_DEFS),$(USER_EXT_$(var)_CPP_UNDEFS),$(C_OPT),$(C_OPT_FILE),C++,$(ext),$(CXX),OBJS))))
+$(foreach ext,cpp cxx cc c++ C,$(foreach var,$(USER_EXT_C_KEYS),$(eval $(call C_PROC_RAW,$(OBJ_OUTPUT),$(USER_EXT_$(var)_SRCS),$(USER_EXT_$(var)_INC_DIRS),$(USER_EXT_$(var)_CPP_INC_FILES),$(USER_EXT_$(var)_CPP_DEFS),$(USER_EXT_$(var)_CPP_UNDEFS),$(CPP_OPT),$(C_OPT_FILE),C++,$(ext),$(CXX),OBJS))))
 endif
 
 
@@ -109,7 +109,7 @@ $(APPFILE) : $(OBJS) $(UOBJS)
 	@echo '  Building target: $@'
 	@echo '  Invoking: C/C++ Linker'
 	$(call MAKEDIRS,$(@D))
-	$(CXX) -o $(APPFILE) $(OBJS) $(UOBJS) $(LIBPATHS) -Xlinker --as-needed $(LIBS) $(LINK_FLAGS) $(TC_LINKER_MISC) $(RS_LINKER_MISC) -pie -lpthread --sysroot="$(SYSROOT)" -Xlinker --version-script="$(PROJ_ROOT)/.exportMap" $(RS_LIB_PATHS) $(RS_LIBRARIES) -Xlinker -rpath="/opt/usr/apps/$(APPID)/lib" -Werror-implicit-function-declaration
+	$(CXX) -o $(APPFILE) $(OBJS) $(UOBJS) $(LIBPATHS) -Xlinker --as-needed $(LIBS) $(LINK_FLAGS) $(TC_LINKER_MISC) $(RS_LINKER_MISC) -pie -lpthread --sysroot="$(SYSROOT)" -Xlinker --version-script="$(PROJ_ROOT)/.exportMap" $(RS_LIB_PATHS) $(RS_LIBRARIES) -Xlinker -rpath="/opt/usr/apps/$(APPID)/lib" -Werror-implicit-function-declaration $(USER_LINK_OPTS)
 	@echo '  Finished building target: $@'
 endif
 ifeq ($(strip $(APPTYPE)),staticLib)
@@ -117,7 +117,7 @@ $(APPFILE) : $(OBJS) $(UOBJS)
 	@echo '  Building target: $@'
 	@echo '  Invoking: Archive utility'
 	$(call MAKEDIRS,$(@D))
-	$(AR) -r $(APPFILE) $(OBJS) $(UOBJS) $(AR_FLAGS)
+	$(AR) -r $(APPFILE) $(OBJS) $(UOBJS) $(AR_FLAGS) $(USER_LINK_OPTS)
 	@echo '  Finished building target: $@'
 endif
 ifeq ($(strip $(APPTYPE)),sharedLib)
@@ -125,7 +125,7 @@ $(APPFILE) : $(OBJS) $(UOBJS)
 	@echo '  Building target: $@'
 	@echo '  Invoking: C/C++ Linker'
 	$(call MAKEDIRS,$(@D))
-	$(CXX) -o $(APPFILE) $(OBJS) $(UOBJS) $(LIBPATHS) -Xlinker --as-needed $(LIBS) $(LINK_FLAGS) $(TC_LINKER_MISC) $(RS_LINKER_MISC) -shared -lpthread --sysroot="$(SYSROOT)" $(RS_LIB_PATHS) $(RS_LIBRARIES)
+	$(CXX) -o $(APPFILE) $(OBJS) $(UOBJS) $(LIBPATHS) -Xlinker --as-needed $(LIBS) $(LINK_FLAGS) $(TC_LINKER_MISC) $(RS_LINKER_MISC) -shared -lpthread --sysroot="$(SYSROOT)" $(RS_LIB_PATHS) $(RS_LIBRARIES) $(USER_LINK_OPTS)
 	@echo '  Finished building target: $@'
 endif
 
diff --git a/src/Common/MsgEngine/src/private/MsgUtilsPrivate.cpp b/src/Common/MsgEngine/src/private/MsgUtilsPrivate.cpp
index bf527fc7..01d3c6f0 100644
--- a/src/Common/MsgEngine/src/private/MsgUtilsPrivate.cpp
+++ b/src/Common/MsgEngine/src/private/MsgUtilsPrivate.cpp
@@ -343,6 +343,8 @@ int MsgUtilsPrivate::ringtoneTypeToNative(MsgSettings::RingtoneType type)
             return MSG_RINGTONE_TYPE_SILENT;
         case MsgSettings::UserRingtone:
             return MSG_RINGTONE_TYPE_USER;
+        default:
+            break;
     }
     return MSG_RINGTONE_TYPE_DEFAULT;
 }
diff --git a/src/Common/Utils/inc/TimeUtils.h b/src/Common/Utils/inc/TimeUtils.h
index a4125633..819164f3 100644
--- a/src/Common/Utils/inc/TimeUtils.h
+++ b/src/Common/Utils/inc/TimeUtils.h
@@ -18,7 +18,7 @@
 #define __MSG_TIME_UTIL_H__
 
 #include <string>
-#include <utils_i18n_types.h>
+#include <utils_i18n.h>
 
 namespace Msg {
     class TimeUtils {
diff --git a/src/Common/Utils/src/TimeUtils.cpp b/src/Common/Utils/src/TimeUtils.cpp
index 7a2bf016..4f3042f0 100644
--- a/src/Common/Utils/src/TimeUtils.cpp
+++ b/src/Common/Utils/src/TimeUtils.cpp
@@ -19,13 +19,7 @@
 
 #include <system_settings.h>
 #include <unistd.h>
-
-/* for i18n */
-#include <cleaned/utils_i18n_ustring.h>
-#include <utils_i18n_ulocale.h>
-#include <utils_i18n_udatepg.h>
-#include <utils_i18n_udate.h>
-#include <utils_i18n_ucalendar.h>
+#include <utils_i18n.h>
 
 using namespace Msg;
 
diff --git a/src/MainApp/MainApp.cpp b/src/MainApp/MainApp.cpp
index 4988f615..ee81b9b9 100644
--- a/src/MainApp/MainApp.cpp
+++ b/src/MainApp/MainApp.cpp
@@ -28,7 +28,7 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <system_settings.h>
-#include <utils_i18n_ulocale.h>
+#include <utils_i18n.h>
 #include <feedback.h>
 
 using namespace Msg;
diff --git a/test/TC/TestTimeUtils.cpp b/test/TC/TestTimeUtils.cpp
index bf748577..b901dde8 100644
--- a/test/TC/TestTimeUtils.cpp
+++ b/test/TC/TestTimeUtils.cpp
@@ -1,17 +1,17 @@
-/*
- * Copyright 2016  Samsung Electronics Co., Ltd
- *
- * Licensed under the Flora License, Version 1.1 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://floralicense.org/license/
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+/*
+ * Copyright 2016  Samsung Electronics Co., Ltd
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 #include <gtest/gtest.h>
@@ -19,7 +19,7 @@
 #include "TimeUtils.h"
 #include <time.h>
 #include <string>
-#include <utils_i18n_ulocale.h>
+#include <utils_i18n.h>
 
 class TimeUtilsTest
     : public Msg::TimeUtils {