[Common] Changed configuration for common profile build

Enabled Application and Alarm features for common build also.

[Verification] Alarm and Application 100% pass with common profile
installed on RPI4

Change-Id: I4f1e992d123e350ba42acc6b9aac38a8f27a82be

diff --git a/packaging/webapi-plugins.spec b/packaging/webapi-plugins.spec
index fcce33a..6cc6f08 100644 (file)
--- a/packaging/webapi-plugins.spec
+++ b/packaging/webapi-plugins.spec
@@ -26,36 +26,36 @@ Summary:    Tizen Web APIs implemented
 Source0:    %{name}-%{version}.tar.gz
 
 ####################################################################
-#       Common Profile : artik                                     #
+#       Common Profile : #TODO list devices                        #
 ####################################################################
 
 %define tizen_common_privilege_engine                        CYNARA
 
-%define tizen_common_feature_account_support                 0
+%define tizen_common_feature_account_support                 1
 %define tizen_common_feature_alarm_support                   1
 %define tizen_common_feature_app_control_settings_support    1
 %define tizen_common_feature_application_support             1
-%define tizen_common_feature_archive_support                 0
-%define tizen_common_feature_badge_support                   0
+%define tizen_common_feature_archive_support                 1
+%define tizen_common_feature_badge_support                   1
 %define tizen_common_feature_bluetooth_support               1
 %define tizen_common_feature_calendar_support                0
 %define tizen_common_feature_callhistory_support             0
 %define tizen_common_feature_contact_support                 0
 %define tizen_common_feature_content_support                 1
-%define tizen_common_feature_datacontrol_support             0
+%define tizen_common_feature_datacontrol_support             1
 %define tizen_common_feature_datasync_support                0
 %define tizen_common_feature_download_support                1
 %define tizen_common_feature_exif_support                    1
-%define tizen_common_feature_feedback_support                0
+%define tizen_common_feature_feedback_support                1
 %define tizen_common_feature_filesystem_support              1
 %define tizen_common_feature_fm_radio_support                0
 %define tizen_common_feature_ham_support                     0
-%define tizen_common_feature_inputdevice_support             0
-%define tizen_common_feature_iotcon_support                  0
-%define tizen_common_feature_key_manager_support             0
+%define tizen_common_feature_inputdevice_support             1
+%define tizen_common_feature_iotcon_support                  1
+%define tizen_common_feature_key_manager_support             1
 %define tizen_common_feature_location_batch                  0
-%define tizen_common_feature_media_controller_support        0
-%define tizen_common_feature_media_key_support               0
+%define tizen_common_feature_media_controller_support        1
+%define tizen_common_feature_media_key_support               1
 %define tizen_common_feature_message_port_support            1
 %define tizen_common_feature_messaging_support               0
 %define tizen_common_feature_metadata_support                1
@@ -64,25 +64,25 @@ Source0:    %{name}-%{version}.tar.gz
 %define tizen_common_feature_nbs_support                     0
 %define tizen_common_feature_nfc_support                     0
 %define tizen_common_feature_nfc_emulation_support           0
-%define tizen_common_feature_notification_support            0
+%define tizen_common_feature_notification_support            1
 %define tizen_common_feature_package_support                 1
-%define tizen_common_feature_player_util_support             0
+%define tizen_common_feature_player_util_support             1
 %define tizen_common_feature_power_support                   0
 %define tizen_common_feature_ppm_support                     0
-%define tizen_common_feature_preference_support              0
-%define tizen_common_feature_push_support                    0
+%define tizen_common_feature_preference_support              1
+%define tizen_common_feature_push_support                    1
 %define tizen_common_feature_se_support                      0
-%define tizen_common_feature_sensor_support                  0
+%define tizen_common_feature_sensor_support                  1
 %define tizen_common_feature_sound_support                   1
 %define tizen_common_feature_system_info_support             1
-%define tizen_common_feature_system_setting_support          0
+%define tizen_common_feature_system_setting_support          1
 %define tizen_common_feature_telephony_support               0
 %define tizen_common_feature_time_support                    1
 %define tizen_common_feature_tvinputdevice_support           0
-%define tizen_common_feature_voicecontrol_support            0
-%define tizen_common_feature_web_setting_support             0
+%define tizen_common_feature_voicecontrol_support            1
+%define tizen_common_feature_web_setting_support             1
 %define tizen_common_feature_wi_fi_support                   1
-%define tizen_common_feature_widget_service_support          0
+%define tizen_common_feature_widget_service_support          1
 
 ####################################################################
 #       Mobile Profile :  TM1(32bit), Redwood(SM-Z910F), KIRAN(Z130H)          #

diff --git a/src/alarm/alarm.gyp b/src/alarm/alarm.gyp
index df129e0..7ac13f2 100644 (file)
--- a/src/alarm/alarm.gyp
+++ b/src/alarm/alarm.gyp
@@ -32,15 +32,10 @@
             ]
           },
         }],
-        ['extension_host_os == "mobile"', {
+        ['extension_host_os == "mobile" or extension_host_os == "wearable" or extension_host_os == "common"', {
             'dependencies': [
               '../notification/notification.gyp:tizen_notification',
             ],
-        }],
-        ['extension_host_os == "wearable"', {
-            'dependencies': [
-             '../notification/notification.gyp:tizen_notification',
-            ],
         }]
       ],
     },

diff --git a/src/alarm/alarm_api.js b/src/alarm/alarm_api.js
index d11b057..8b386bb 100755 (executable)
--- a/src/alarm/alarm_api.js
+++ b/src/alarm/alarm_api.js
@@ -571,7 +571,7 @@ var ProfileAlarm = (function() {
 var _profile = ProfileAlarm.getInstance().profile;
 
 // Notifications feature are available on mobile and wearable profile
-if (_profile != 'mobile' && _profile != 'wearable') {
+if (_profile != 'mobile' && _profile != 'wearable' && _profile != 'common') {
     delete AlarmManager.prototype.addAlarmNotification;
     delete AlarmManager.prototype.getAlarmNotification;
     isAlarmAbsolutePeriodDeprecated = false;

diff --git a/src/alarm/alarm_instance.cc b/src/alarm/alarm_instance.cc
index 7a8012f..854934b 100644 (file)
--- a/src/alarm/alarm_instance.cc
+++ b/src/alarm/alarm_instance.cc
@@ -43,10 +43,10 @@ AlarmInstance::AlarmInstance() {
   REGISTER_METHOD(AlarmManagerGetNextScheduledDate);
 
 // Block of code related to Notification
-#if defined(TIZEN_MOBILE) || defined(TIZEN_WEARABLE)
+#if defined(TIZEN_MOBILE) || defined(TIZEN_WEARABLE) || defined(TIZEN_COMMON)
   REGISTER_METHOD(AlarmManagerAddAlarmNotification);
   REGISTER_METHOD(AlarmManagerGetAlarmNotification);
-#endif  // TIZEN_MOBILE or TIZEN_WEARABLE
+#endif  // TIZEN_MOBILE or TIZEN_WEARABLE or TIZEN_COMMON
 
 #undef REGISTER_METHOD
 }
@@ -80,7 +80,7 @@ void AlarmInstance::AlarmManagerGetAll(const picojson::value& args, picojson::ob
   manager_.GetAll(args, out);
 }
 
-#if defined(TIZEN_MOBILE) || defined(TIZEN_WEARABLE)
+#if defined(TIZEN_MOBILE) || defined(TIZEN_WEARABLE) || defined(TIZEN_COMMON)
 void AlarmInstance::AlarmManagerAddAlarmNotification(const picojson::value& args,
                                                      picojson::object& out) {
   ScopeLogger();
@@ -92,7 +92,7 @@ void AlarmInstance::AlarmManagerGetAlarmNotification(const picojson::value& args
   ScopeLogger();
   manager_.GetAlarmNotification(args, out);
 }
-#endif  // TIZEN_MOBILE or TIZEN_WEARABLE
+#endif  // TIZEN_MOBILE or TIZEN_WEARABLE or TIZEN_COMMON
 
 void AlarmInstance::AlarmManagerGetRemainingSeconds(const picojson::value& args,
                                                     picojson::object& out) {

diff --git a/src/alarm/alarm_manager.cc b/src/alarm/alarm_manager.cc
index 4bd5212..4eae000 100644 (file)
--- a/src/alarm/alarm_manager.cc
+++ b/src/alarm/alarm_manager.cc
@@ -21,7 +21,7 @@
 #include <app_alarm.h>
 #include <app_control_internal.h>
 
-#if defined(TIZEN_MOBILE) || defined(TIZEN_WEARABLE)
+#if defined(TIZEN_MOBILE) || defined(TIZEN_WEARABLE) || defined(TIZEN_COMMON)
 #include <notification_internal.h>
 #endif
 
@@ -263,7 +263,7 @@ void AlarmManager::Add(const picojson::value& args, picojson::object& out) {
   ReportSuccess(result, out);
 }
 
-#if defined(TIZEN_MOBILE) || defined(TIZEN_WEARABLE)
+#if defined(TIZEN_MOBILE) || defined(TIZEN_WEARABLE) || defined(TIZEN_COMMON)
 void AlarmManager::AddAlarmNotification(const picojson::value& args, picojson::object& out) {
   using namespace extension::notification;
   ScopeLogger();
@@ -696,7 +696,7 @@ void AlarmManager::Get(const picojson::value& args, picojson::object& out) {
   }
 }
 
-#if defined(TIZEN_MOBILE) || defined(TIZEN_WEARABLE)
+#if defined(TIZEN_MOBILE) || defined(TIZEN_WEARABLE) || defined(TIZEN_COMMON)
 void AlarmManager::GetAlarmNotification(const picojson::value& args, picojson::object& out) {
   using namespace extension::notification;
   ScopeLogger();

diff --git a/src/alarm/alarm_manager.h b/src/alarm/alarm_manager.h
index df5559b..a5eef41 100644 (file)
--- a/src/alarm/alarm_manager.h
+++ b/src/alarm/alarm_manager.h
@@ -34,7 +34,7 @@ class AlarmManager {
   void Get(const picojson::value& args, picojson::object& out);
   void GetAll(const picojson::value& args, picojson::object& out);
 
-#if defined(TIZEN_MOBILE) || defined(TIZEN_WEARABLE)
+#if defined(TIZEN_MOBILE) || defined(TIZEN_WEARABLE) || defined(TIZEN_COMMON)
   void AddAlarmNotification(const picojson::value& args, picojson::object& out);
   void GetAlarmNotification(const picojson::value& args, picojson::object& out);
 #endif

diff --git a/src/application/application.gyp b/src/application/application.gyp
index 29acdf2..e56673e 100644 (file)
--- a/src/application/application.gyp
+++ b/src/application/application.gyp
@@ -43,7 +43,7 @@
             ]
           },
         }],
-        ['extension_host_os == "mobile" or extension_host_os == "wearable"', {
+        ['extension_host_os == "mobile" or extension_host_os == "wearable" or extension_host_os == "common"', {
           'variables': {
             'packages': [
               'capi-context',

diff --git a/src/application/application_manager.cc b/src/application/application_manager.cc
index 039842b..c8c7c25 100644 (file)
--- a/src/application/application_manager.cc
+++ b/src/application/application_manager.cc
@@ -99,7 +99,7 @@ const std::map<std::string, std::string> event_map_ = {
     {SYSTEM_EVENT_DATA_ROAMING_STATE, EVENT_KEY_DATA_ROAMING_STATE},
     {SYSTEM_EVENT_FONT_SET, EVENT_KEY_FONT_SET}};
 
-#if defined(TIZEN_MOBILE) || defined(TIZEN_WEARABLE)
+#if defined(TIZEN_MOBILE) || defined(TIZEN_WEARABLE) || defined(TIZEN_COMMON)
 const int kMaximumBatteryRetrievedObjects = 30;
 const int kMaximumAppsRetrievedObjects = 10;
 const int kDefaultPeriodOfTime = 30;
@@ -1195,7 +1195,7 @@ void ApplicationManager::GetAppSharedUri(const std::string& app_id, picojson::ob
   ReportSuccess(result, *out);
 }
 
-#if defined(TIZEN_MOBILE) || defined(TIZEN_WEARABLE)
+#if defined(TIZEN_MOBILE) || defined(TIZEN_WEARABLE) || defined(TIZEN_COMMON)
 PlatformResult ApplicationManager::BatteryUsageFilter(const picojson::value& args,
                                                       const context_history_filter_h filter,
                                                       context_history_data_e* data_type_out) {
@@ -1383,7 +1383,7 @@ PlatformResult ApplicationManager::AppsUsageAttributes(const context_history_rec
 void ApplicationManager::GetBatteryUsageInfo(const picojson::value& args, picojson::object* out) {
   ScopeLogger();
 
-#if defined(TIZEN_MOBILE) || defined(TIZEN_WEARABLE)
+#if defined(TIZEN_MOBILE) || defined(TIZEN_WEARABLE) || defined(TIZEN_COMMON)
   int callback_id = -1;
   const auto& callback = args.get(kCallbackId);
   if (callback.is<double>()) {
@@ -1422,7 +1422,7 @@ void ApplicationManager::GetBatteryUsageInfo(const picojson::value& args, picojs
 void ApplicationManager::GetAppsUsageInfo(const picojson::value& args, picojson::object* out) {
   ScopeLogger();
 
-#if defined(TIZEN_MOBILE) || defined(TIZEN_WEARABLE)
+#if defined(TIZEN_MOBILE) || defined(TIZEN_WEARABLE) || defined(TIZEN_COMMON)
   int callback_id = static_cast<int>(args.get(kCallbackId).get<double>());
 
   auto get_apps_usage = [args](const std::shared_ptr<picojson::value>& response) -> void {
@@ -1986,7 +1986,7 @@ void ApplicationManager::OnStatusEvent(const char* type, const char* app_id,
   manager->status_callback_(&event);
 }
 
-#if defined(TIZEN_MOBILE) || defined(TIZEN_WEARABLE)
+#if defined(TIZEN_MOBILE) || defined(TIZEN_WEARABLE) || defined(TIZEN_COMMON)
 PlatformResult ApplicationManager::GetContextHistory(
     const picojson::value& args, picojson::object* out,
     common::PlatformResult (*modify_filter_cb)(const picojson::value&,

diff --git a/src/application/application_manager.h b/src/application/application_manager.h
index 0af4301..a7485ce 100644 (file)
--- a/src/application/application_manager.h
+++ b/src/application/application_manager.h
@@ -27,7 +27,7 @@
 #include <mutex>
 #include <set>
 #include <string>
-#if defined(TIZEN_MOBILE)
+#if defined(TIZEN_MOBILE) || defined(TIZEN_COMMON)
 #include <context-service/context_history.h>
 #elif defined(TIZEN_WEARABLE)
 #include <context-service/wearable/context_history.h>
@@ -101,7 +101,7 @@ class ApplicationManager {
                             app_manager_event_state_e event_state, app_manager_event_h handle,
                             void* user_data);
 
-#if defined(TIZEN_MOBILE) || defined(TIZEN_WEARABLE)
+#if defined(TIZEN_MOBILE) || defined(TIZEN_WEARABLE) || defined(TIZEN_COMMON)
   static common::PlatformResult GetContextHistory(
       const picojson::value& args, picojson::object* out,
       common::PlatformResult (*)(const picojson::value&, const context_history_filter_h,

diff --git a/src/common/common.gypi b/src/common/common.gypi
index 68ca831..3ada568 100644 (file)
--- a/src/common/common.gypi
+++ b/src/common/common.gypi
@@ -43,6 +43,7 @@
       ['extension_host_os == "mobile"', { 'defines': ['TIZEN_MOBILE'] } ],
       ['extension_host_os == "ivi"', { 'defines': ['TIZEN_IVI'] } ],
       ['extension_host_os == "desktop"', { 'defines': ['GENERIC_DESKTOP'] } ],
+      ['extension_host_os == "common"', { 'defines': ['TIZEN_COMMON'] } ],
       ['extension_build_type== "Debug"', {
         'defines': ['_DEBUG', 'TIZEN_DEBUG_ENABLE', ],
         'cflags': [ '-O0', '-g', ],