From 0be0b70b30866c7ab9f5a4b57864260ba4f97ebc Mon Sep 17 00:00:00 2001 From: Youngsoo Choi Date: Fri, 7 Aug 2015 12:43:50 +0900 Subject: [PATCH] Remove dependencies of tizen v2.2.1 The tizen v2.2.1 is not supported anymore. Bug: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=14148 Reviewed by: SeungSeop Park, Antonio Gomes Change-Id: I3072ff0cf6825caaf8cc487061df9ee0c3aae7d9 Signed-off-by: Youngsoo Choi --- tizen_src/build/common.sh | 2 +- tizen_src/build/cross_build_tv.sh | 2 +- tizen_src/build/gbs.conf | 82 ---------------------- .../device_sensors/data_fetcher_impl_tizen.cc | 75 -------------------- .../browser/web_contents/web_drag_dest_efl.cc | 4 -- .../chromium_impl/content/common/paths_efl.cc | 4 -- tizen_src/ewk/efl_webview_app/app.c | 28 -------- tizen_src/ewk/efl_webview_app/mini_browser.c | 28 -------- tizen_src/ewk/tizen_version_defines_for_apps.gypi | 5 -- tizen_src/packaging/chromium-efl-libs.spec | 3 - tizen_src/packaging/chromium-efl.spec | 3 - tizen_src/packaging/crosswalk-bin.spec | 3 - tizen_src/supplement.gypi | 12 ---- 13 files changed, 2 insertions(+), 249 deletions(-) diff --git a/tizen_src/build/common.sh b/tizen_src/build/common.sh index af942e6..6917b60 100755 --- a/tizen_src/build/common.sh +++ b/tizen_src/build/common.sh @@ -226,7 +226,7 @@ function setupAndExecuteTargetBuild() { fi EXTRA_PACK_OPTS="" - if [ "$PROFILE" == "tztv_v2.2.1_prehawk" -o "$PROFILE" == "tztv_v2.4_product" ]; then + if [ "$PROFILE" == "tztv_v2.4_product" ]; then EXTRA_PACK_OPTS="--extra-packs python-base-x86-arm,python-x86-arm,python-xml-x86-arm" fi diff --git a/tizen_src/build/cross_build_tv.sh b/tizen_src/build/cross_build_tv.sh index fdffb91..b7e34f0 100755 --- a/tizen_src/build/cross_build_tv.sh +++ b/tizen_src/build/cross_build_tv.sh @@ -61,7 +61,7 @@ export PATH="${TOPDIR}/build/cross-shim:$PATH" preBuild ${SYSROOTDIR} export __GYP_CHROMIUMEFL_TARGET=crosscompile -hostGypChromiumEfl -Dbuilding_for_tizen_tv=1 -Dchromium_efl_tizen_version="2.2.1" +hostGypChromiumEfl -Dbuilding_for_tizen_tv=1 -Dchromium_efl_tizen_version="2.4" hostNinja crosscompile RET=$? diff --git a/tizen_src/build/gbs.conf b/tizen_src/build/gbs.conf index fbddf0a..baee7e9 100755 --- a/tizen_src/build/gbs.conf +++ b/tizen_src/build/gbs.conf @@ -75,88 +75,6 @@ url = http://10.251.52.177/tizenrepo/jpn-dcm/Redwood8974JPNDCM_20131218.006 [repo.tizenmb_supplement] url = http://10.251.52.177/tizenrepo/jpn-dcm/supplement -############################################### -# -# Tizen v2.2.1 for tv (GolfP Platform Binary) -# -[profile.tztv_v2.2.1_golfp] -repos = repo.tztv_2.2.1_golfp_supplement, repo.tztv_2.2.1_golfp_product, repo.tztv_2.2.1_golfp_profile, repo.tztv_2.2.1_golfp_product_i586, repo.tztv_2.2.1_golfp_profile_i586, repo.tztv_2.2.1_golfp_base -buildroot = ~/GBS-TV-2.2.1-GOLFP - -[repo.tztv_2.2.1_golfp_product] -url = http://10.251.52.177/tizenrepo/tv_repo/snapshots/tztv-2.2.1/product/tztv-2.2.1_20140807.3/repos/product/armv7l/packages/ - -[repo.tztv_2.2.1_golfp_profile] -url = http://10.251.52.177/tizenrepo/tv_repo/snapshots/tztv-2.2.1/product/tztv-2.2.1_20140807.3/repos/profile/armv7l/packages/ - -[repo.tztv_2.2.1_golfp_product_i586] -url = http://10.251.52.177/tizenrepo/tv_repo/snapshots/tztv-2.2.1/product/tztv-2.2.1_20140807.3/repos/product/ia32/packages/ - -[repo.tztv_2.2.1_golfp_profile_i586] -url = http://10.251.52.177/tizenrepo/tv_repo/snapshots/tztv-2.2.1/product/tztv-2.2.1_20140807.3/repos/profile/ia32/packages/ - -[repo.tztv_2.2.1_golfp_base] -url = http://10.251.52.177/tizenrepo/tv_repo/tizen-rsa/tizen-2.2.1 - -# Supplementary repo for additional rpms packages required in gbs build -[repo.tztv_2.2.1_golfp_supplement] -url = http://10.251.52.177/tizenrepo/tv_repo/supplement_tv - -############################################### -# -# Tizen v2.2.1 for tv (Prehawk Platform Binary) -# -[profile.tztv_v2.2.1_prehawk] -repos = repo.tztv_2.2.1_prehawk_supplement, repo.tztv_2.2.1_prehawk_product, repo.tztv_2.2.1_prehawk_profile, repo.tztv_2.2.1_prehawk_base -buildroot = ~/GBS-TV-2.2.1-PREHAWK - -[repo.tztv_2.2.1_prehawk_product] -url = http://10.251.52.177/tizenrepo/tv_repo/Prehawk_atsc_20141018.5/repos/product/armv7l/packages/ - -[repo.tztv_2.2.1_prehawk_profile] -url = http://10.251.52.177/tizenrepo/tv_repo/Prehawk_atsc_20141018.5/repos/profile/armv7l/packages/ - -[repo.tztv_2.2.1_prehawk_base] -url = http://10.251.52.177/tizenrepo/tv_repo/tizen-2.2.1-vd-4.8_20140822.1 - -# Supplementary repo for additional rpms packages required in gbs build -[repo.tztv_2.2.1_prehawk_supplement] -# This supplement is temporary repository for capi-media-player package -# which added new API (player_get_content_video_size). -# If this package will be merged, I'll change this codes -url = http://10.251.52.177/tizenrepo/tv_repo/supplement_tv_prehawk_player - -############################################### -# -# Tizen v2.2.1 for tv (HawkP Platform Binary) -# -[profile.tztv_v2.2.1_hawkp] -obs = obs.tizentv -repos = repo.supplement_hawkp, repo.product_hawkp, repo.profile_hawkp, repo.main_hawk_4.8, repo.base_hawk_4.8 -buildroot = ~/GBS-TV-2.2.1-HAWK-P - -[obs.tizentv] -url = https://168.219.241.169/api -user = obs_viewer -passwdx = obs_viewer_169 - -# mirrored from http://168.219.244.109/tizen-rsa/tizen-2.2.1-vd-4.8/standard -[repo.base_hawk_4.8] -url = http://10.251.52.177/tizenrepo/tv_repo/hawkp/tizen-2.2.1-vd-4.8/repos/base/armv7l/packages - -[repo.main_hawk_4.8] -url = http://10.251.52.177/tizenrepo/tv_repo/hawkp/tizen-2.2.1-vd-4.8/repos/main/armv7l/packages - -# mirrored from http://168.219.244.109/snapshots/tztv-2.2.1-hawk-p/product/Hawk-P -[repo.product_hawkp] -url = http://10.251.52.177/tizenrepo/tv_repo/hawkp/tztv-2.2.1-hawk-p/repos/product/armv7l/packages - -[repo.profile_hawkp] -url = http://10.251.52.177/tizenrepo/tv_repo/hawkp/tztv-2.2.1-hawk-p/repos/profile/armv7l/packages - -[repo.supplement_hawkp] -url = http://10.251.52.177/tizenrepo/tv_repo/supplement_tv_hawk - ############################################# # # Tizen v2.4 for product tv (HawkP armv7l) diff --git a/tizen_src/chromium_impl/content/browser/device_sensors/data_fetcher_impl_tizen.cc b/tizen_src/chromium_impl/content/browser/device_sensors/data_fetcher_impl_tizen.cc index c10e97d..c01c3a5 100644 --- a/tizen_src/chromium_impl/content/browser/device_sensors/data_fetcher_impl_tizen.cc +++ b/tizen_src/chromium_impl/content/browser/device_sensors/data_fetcher_impl_tizen.cc @@ -10,14 +10,12 @@ namespace content { -#if !TIZEN_VERSION_EQ(2,2,1) static sensor_h sensor_orientation_; static sensor_h sensor_accelerometer_; static sensor_h sensor_gyroscope_; static sensor_listener_h listener_orientation_; static sensor_listener_h listener_accelerometer_; static sensor_listener_h listener_gyroscope_; -#endif DataFetcherImplTizen::DataFetcherImplTizen() : device_motion_buffer_(NULL), @@ -25,7 +23,6 @@ DataFetcherImplTizen::DataFetcherImplTizen() has_last_motion_data_(false), last_motion_timestamp_(0), is_orientation_buffer_ready_(false) { -#if !TIZEN_VERSION_EQ(2,2,1) sensor_get_default_sensor(SENSOR_ORIENTATION, &sensor_orientation_); sensor_get_default_sensor(SENSOR_ACCELEROMETER, &sensor_accelerometer_); sensor_get_default_sensor(SENSOR_GYROSCOPE, &sensor_gyroscope_); @@ -33,16 +30,9 @@ DataFetcherImplTizen::DataFetcherImplTizen() sensor_create_listener(sensor_orientation_, &listener_orientation_); sensor_create_listener(sensor_accelerometer_, &listener_accelerometer_); sensor_create_listener(sensor_gyroscope_, &listener_gyroscope_); -#else - sensor_create(&handle_); - sensor_orientation_set_cb(handle_, - kInertialSensorIntervalMicroseconds / 1000, - DataFetcherImplTizen::onOrientationChanged, this); -#endif } DataFetcherImplTizen::~DataFetcherImplTizen() { -#if !TIZEN_VERSION_EQ(2,2,1) sensor_listener_unset_event_cb(listener_orientation_); sensor_listener_stop(listener_orientation_); sensor_destroy_listener(listener_orientation_); @@ -53,9 +43,6 @@ DataFetcherImplTizen::~DataFetcherImplTizen() { sensor_listener_stop(listener_gyroscope_); sensor_destroy_listener(listener_gyroscope_); -#else - sensor_destroy(handle_); -#endif } DataFetcherImplTizen* DataFetcherImplTizen::GetInstance() { @@ -70,15 +57,9 @@ bool DataFetcherImplTizen::StartFetchingDeviceMotionData( base::AutoLock autolock(motion_buffer_lock_); device_motion_buffer_ = buffer; } -#if !TIZEN_VERSION_EQ(2,2,1) sensor_listener_set_event_cb(listener_accelerometer_, kInertialSensorIntervalMicroseconds / 1000, DataFetcherImplTizen::onAccelerationChanged, this); -#else - sensor_accelerometer_set_cb(handle_, - kInertialSensorIntervalMicroseconds / 1000, - DataFetcherImplTizen::onAccelerationChanged, this); -#endif return Start(CONSUMER_TYPE_MOTION); } @@ -87,12 +68,7 @@ void DataFetcherImplTizen::StopFetchingDeviceMotionData() { { base::AutoLock autolock(motion_buffer_lock_); if (device_motion_buffer_) { -#if !TIZEN_VERSION_EQ(2,2,1) sensor_listener_unset_event_cb(listener_accelerometer_); -#else - sensor_accelerometer_set_cb(handle_, - kInertialSensorIntervalMicroseconds / 1000, NULL, this); -#endif device_motion_buffer_ = NULL; } } @@ -105,15 +81,9 @@ bool DataFetcherImplTizen::StartFetchingDeviceOrientationData( base::AutoLock autolock(orientation_buffer_lock_); device_orientation_buffer_ = buffer; } -#if !TIZEN_VERSION_EQ(2,2,1) sensor_listener_set_event_cb(listener_orientation_, kInertialSensorIntervalMicroseconds / 1000, DataFetcherImplTizen::onOrientationChanged, this); -#else - sensor_orientation_set_cb(handle_, - kInertialSensorIntervalMicroseconds / 1000, - DataFetcherImplTizen::onOrientationChanged, this); -#endif bool success = Start(CONSUMER_TYPE_ORIENTATION); { @@ -131,12 +101,7 @@ void DataFetcherImplTizen::StopFetchingDeviceOrientationData() { base::AutoLock autolock(orientation_buffer_lock_); if (device_orientation_buffer_) { SetOrientationBufferReadyStatus(false); -#if !TIZEN_VERSION_EQ(2,2,1) sensor_listener_unset_event_cb(listener_orientation_); -#else - sensor_orientation_set_cb(handle_, - kInertialSensorIntervalMicroseconds / 1000, NULL, this); -#endif device_orientation_buffer_ = NULL; } } @@ -144,7 +109,6 @@ void DataFetcherImplTizen::StopFetchingDeviceOrientationData() { bool DataFetcherImplTizen::Start(ConsumerType type) { switch(type) { -#if !TIZEN_VERSION_EQ(2,2,1) case CONSUMER_TYPE_ORIENTATION: return (SENSOR_ERROR_NONE == sensor_listener_start(listener_orientation_)); case CONSUMER_TYPE_MOTION: @@ -152,15 +116,6 @@ bool DataFetcherImplTizen::Start(ConsumerType type) { return false; } return (SENSOR_ERROR_NONE == sensor_listener_start(listener_gyroscope_)); -#else - case CONSUMER_TYPE_ORIENTATION: - return (SENSOR_ERROR_NONE == sensor_start(handle_, SENSOR_ORIENTATION)); - case CONSUMER_TYPE_MOTION: - if (SENSOR_ERROR_NONE != sensor_start(handle_, SENSOR_ACCELEROMETER)) { - return false; - } - return (SENSOR_ERROR_NONE == sensor_start(handle_, SENSOR_GYROSCOPE)); -#endif default: NOTREACHED(); return false; @@ -171,20 +126,11 @@ bool DataFetcherImplTizen::Start(ConsumerType type) { void DataFetcherImplTizen::Stop(ConsumerType type) { switch(type) { case CONSUMER_TYPE_ORIENTATION: -#if !TIZEN_VERSION_EQ(2,2,1) sensor_listener_stop(listener_orientation_); -#else - sensor_stop(handle_, SENSOR_ORIENTATION); -#endif return; case CONSUMER_TYPE_MOTION: -#if !TIZEN_VERSION_EQ(2,2,1) sensor_listener_stop(listener_accelerometer_); sensor_listener_stop(listener_gyroscope_); -#else - sensor_stop(handle_, SENSOR_ACCELEROMETER); - sensor_stop(handle_, SENSOR_GYROSCOPE); -#endif memset(&last_motion_data_, 0, sizeof(last_motion_data_)); has_last_motion_data_ = false; return; @@ -195,13 +141,8 @@ void DataFetcherImplTizen::Stop(ConsumerType type) { } //static -#if !TIZEN_VERSION_EQ(2,2,1) void DataFetcherImplTizen::onOrientationChanged(sensor_h sensor, sensor_event_s *event, void* userData) { -#else -void DataFetcherImplTizen::onOrientationChanged(unsigned long long timestamp, - sensor_data_accuracy_e, float azimuth, float pitch, float roll, void* userData) { -#endif DataFetcherImplTizen *fetcher = static_cast(userData); base::AutoLock autolock(fetcher->orientation_buffer_lock_); @@ -210,11 +151,9 @@ void DataFetcherImplTizen::onOrientationChanged(unsigned long long timestamp, fetcher->device_orientation_buffer_->seqlock.WriteBegin(); -#if !TIZEN_VERSION_EQ(2,2,1) float azimuth = event->values[0]; float pitch = event->values[1]; float roll = event->values[2]; -#endif fetcher->device_orientation_buffer_->data.alpha = azimuth; fetcher->device_orientation_buffer_->data.hasAlpha = true; @@ -229,29 +168,20 @@ void DataFetcherImplTizen::onOrientationChanged(unsigned long long timestamp, } //static -#if !TIZEN_VERSION_EQ(2,2,1) void DataFetcherImplTizen::onAccelerationChanged(sensor_h sensor, sensor_event_s *event, void* userData) { -#else -void DataFetcherImplTizen::onAccelerationChanged(unsigned long long timestamp, - sensor_data_accuracy_e, float x, float y, float z, void* userData) { -#endif DataFetcherImplTizen *self = static_cast(userData); -#if !TIZEN_VERSION_EQ(2,2,1) float x = event->values[0]; float y = event->values[1]; float z = event->values[2]; -#endif float gravityX = x * 0.2f; float gravityY = y * 0.2f; float gravityZ = z * 0.2f; bool accelerationAvailable = false; -#if !TIZEN_VERSION_EQ(2,2,1) unsigned long long timestamp = event->timestamp; -#endif double interval = static_cast(self->last_motion_timestamp_ ? (timestamp - self->last_motion_timestamp_) / 1000 : @@ -269,7 +199,6 @@ void DataFetcherImplTizen::onAccelerationChanged(unsigned long long timestamp, float alpha, beta, gamma; bool rotationRateAvailable = false; -#if !TIZEN_VERSION_EQ(2,2,1) sensor_event_s event_gyroscope; if (!sensor_listener_read_data(listener_gyroscope_, &event_gyroscope)) rotationRateAvailable = true; @@ -277,10 +206,6 @@ void DataFetcherImplTizen::onAccelerationChanged(unsigned long long timestamp, alpha = event_gyroscope.values[0]; beta = event_gyroscope.values[1]; gamma = event_gyroscope.values[2]; -#else - if (!sensor_gyroscope_read_data(self->handle_, 0, &alpha, &beta, &gamma)) - rotationRateAvailable = true; -#endif self->device_motion_buffer_->seqlock.WriteBegin(); diff --git a/tizen_src/chromium_impl/content/browser/web_contents/web_drag_dest_efl.cc b/tizen_src/chromium_impl/content/browser/web_contents/web_drag_dest_efl.cc index bd81e4d..b91fd07 100644 --- a/tizen_src/chromium_impl/content/browser/web_contents/web_drag_dest_efl.cc +++ b/tizen_src/chromium_impl/content/browser/web_contents/web_drag_dest_efl.cc @@ -64,15 +64,11 @@ void WebDragDestEfl::SetDragCallbacks() { } void WebDragDestEfl::UnsetDragCallbacks() { -#if TIZEN_VERSION_EQ(2,2,1) - elm_drop_target_del(parent_view_); -#else elm_drop_target_del(parent_view_, ELM_SEL_FORMAT_TEXT, DragStateEnterCb, this, DragStateLeaveCb, this, DragPosCb, this, DragDropCb, this); -#endif } void WebDragDestEfl::ResetDragCallbacks() { diff --git a/tizen_src/chromium_impl/content/common/paths_efl.cc b/tizen_src/chromium_impl/content/common/paths_efl.cc index 429a6b9..9122fa5 100644 --- a/tizen_src/chromium_impl/content/common/paths_efl.cc +++ b/tizen_src/chromium_impl/content/common/paths_efl.cc @@ -63,14 +63,10 @@ bool GetDirAppDataTizen(base::FilePath& result) { } bool GetDirChromiumPrivateTizen(base::FilePath& result) { -#if TIZEN_VERSION_AT_LEAST(2,3,0) scoped_ptr data_path(app_get_data_path()); if (data_path) { result = base::FilePath(data_path.get()); } else if (!GetDirAppDataTizen(result)) { -#else - if (!GetDirAppDataTizen(result)) { -#endif return false; } result = result.Append(kApplicationName); diff --git a/tizen_src/ewk/efl_webview_app/app.c b/tizen_src/ewk/efl_webview_app/app.c index e7ce5ea..993fcec 100644 --- a/tizen_src/ewk/efl_webview_app/app.c +++ b/tizen_src/ewk/efl_webview_app/app.c @@ -26,11 +26,7 @@ #include #if defined(OS_TIZEN_MOBILE) -#ifndef TIZEN_LEGACY_V_2_2_1 #include -#else -#include -#endif #endif #include @@ -1265,13 +1261,8 @@ Eina_Bool __vibration_timeout_cb(void *data) { g_haptic_timer_id = NULL; if (g_haptic_handle) { -#ifndef TIZEN_LEGACY_V_2_2_1 device_haptic_stop(g_haptic_handle, g_haptic_effect); device_haptic_close(g_haptic_handle); -#else - haptic_stop_effect(g_haptic_handle, g_haptic_effect); - haptic_close(g_haptic_handle); -#endif g_haptic_handle = NULL; } @@ -1289,31 +1280,17 @@ void __vibration_on_cb(uint64_t vibration_time, void *data) } if (g_haptic_handle) { -#ifndef TIZEN_LEGACY_V_2_2_1 device_haptic_stop(g_haptic_handle, g_haptic_effect); device_haptic_close(g_haptic_handle); -#else - haptic_stop_effect(g_haptic_handle, g_haptic_effect); - haptic_close(g_haptic_handle); -#endif g_haptic_handle = NULL; } -#ifndef TIZEN_LEGACY_V_2_2_1 if (device_haptic_open(0, &g_haptic_handle) != DEVICE_ERROR_NONE) { printf("__vibration_on_cb:device_haptic_open failed"); -#else - if (haptic_open(HAPTIC_DEVICE_0, &g_haptic_handle) != HAPTIC_ERROR_NONE) { - printf("__vibration_on_cb:haptic_open failed"); -#endif return; } -#ifndef TIZEN_LEGACY_V_2_2_1 device_haptic_vibrate(g_haptic_handle, duration, 100, &g_haptic_effect); -#else - haptic_vibrate_monotone(g_haptic_handle, duration, &g_haptic_effect); -#endif double in = (double)((double)(duration) / (double)(1000)); printf("__vibration_on_cb:duration=%f", in); @@ -1329,13 +1306,8 @@ void __vibration_off_cb(void *data) } if (g_haptic_handle) { -#ifndef TIZEN_LEGACY_V_2_2_1 device_haptic_stop(g_haptic_handle, g_haptic_effect); device_haptic_close(g_haptic_handle); -#else - haptic_stop_effect(g_haptic_handle, g_haptic_effect); - haptic_close(g_haptic_handle); -#endif g_haptic_handle = NULL; } } diff --git a/tizen_src/ewk/efl_webview_app/mini_browser.c b/tizen_src/ewk/efl_webview_app/mini_browser.c index 81471d1b..b1090ad 100644 --- a/tizen_src/ewk/efl_webview_app/mini_browser.c +++ b/tizen_src/ewk/efl_webview_app/mini_browser.c @@ -21,11 +21,7 @@ #include #if defined(OS_TIZEN_MOBILE) -#ifndef TIZEN_LEGACY_V_2_2_1 #include -#else -#include -#endif #endif #include "public/ewk_context.h" @@ -1525,13 +1521,8 @@ Eina_Bool __vibration_timeout_cb(void *data) { s_haptic_timer_id = NULL; if (s_haptic_handle) { -#ifndef TIZEN_LEGACY_V_2_2_1 device_haptic_stop(s_haptic_handle, s_haptic_effect); device_haptic_close(s_haptic_handle); -#else - haptic_stop_effect(s_haptic_handle, s_haptic_effect); - haptic_close(s_haptic_handle); -#endif s_haptic_handle = NULL; } @@ -1551,31 +1542,17 @@ void __vibration_on_cb(uint64_t vibration_time, void *data) } if (s_haptic_handle) { -#ifndef TIZEN_LEGACY_V_2_2_1 device_haptic_stop(s_haptic_handle, s_haptic_effect); device_haptic_close(s_haptic_handle); -#else - haptic_stop_effect(s_haptic_handle, s_haptic_effect); - haptic_close(s_haptic_handle); -#endif s_haptic_handle = NULL; } -#ifndef TIZEN_LEGACY_V_2_2_1 if (device_haptic_open(0, &s_haptic_handle) != DEVICE_ERROR_NONE) { printf("[%s][%d][%s] ERROR: __vibration_on_cb:device_haptic_open failed\n", __FUNCTION__, __LINE__, "vibration"); -#else - if (haptic_open(HAPTIC_DEVICE_0, &s_haptic_handle) != HAPTIC_ERROR_NONE) { - printf("[%s][%d][%s] ERROR: __vibration_on_cb:haptic_open failed\n", __FUNCTION__, __LINE__, "vibration"); -#endif return; } -#ifndef TIZEN_LEGACY_V_2_2_1 device_haptic_vibrate(s_haptic_handle, duration, 100, &s_haptic_effect); -#else - haptic_vibrate_monotone(s_haptic_handle, duration, &s_haptic_effect); -#endif double in = (double)((double)(duration) / (double)(1000)); printf("[%s][%d][%s] __vibration_on_cb:duration=%f\n", __FUNCTION__, __LINE__, "vibration", in); @@ -1593,13 +1570,8 @@ void __vibration_off_cb(void *data) } if (s_haptic_handle) { -#ifndef TIZEN_LEGACY_V_2_2_1 device_haptic_stop(s_haptic_handle, s_haptic_effect); device_haptic_close(s_haptic_handle); -#else - haptic_stop_effect(s_haptic_handle, s_haptic_effect); - haptic_close(s_haptic_handle); -#endif s_haptic_handle = NULL; } } diff --git a/tizen_src/ewk/tizen_version_defines_for_apps.gypi b/tizen_src/ewk/tizen_version_defines_for_apps.gypi index 21e1f1e..7ae2c06 100644 --- a/tizen_src/ewk/tizen_version_defines_for_apps.gypi +++ b/tizen_src/ewk/tizen_version_defines_for_apps.gypi @@ -21,11 +21,6 @@ 'TIZEN_V_2_3=1', ], }], - ['chromium_efl_tizen_version=="2.2.1"', { - 'defines': [ - 'TIZEN_LEGACY_V_2_2_1=1', - ], - }], ], }], ], # conditions diff --git a/tizen_src/packaging/chromium-efl-libs.spec b/tizen_src/packaging/chromium-efl-libs.spec index e0092fa..c864461 100644 --- a/tizen_src/packaging/chromium-efl-libs.spec +++ b/tizen_src/packaging/chromium-efl-libs.spec @@ -157,9 +157,6 @@ trap 'tizen_src/build/apply_patches.sh -r' EXIT %if "%{tizen}" == "2.0" %define chromium_efl_tizen_version 2.3 %endif -%if "%{tizen}" == "2.2.1" -%define chromium_efl_tizen_version 2.2.1 -%endif %if %{!?TIZEN_PROFILE_TV:0}%{?TIZEN_PROFILE_TV:1} || "%{!?profile:0}%{?profile}" == "tv" %define chromium_efl_tizen_profile tv diff --git a/tizen_src/packaging/chromium-efl.spec b/tizen_src/packaging/chromium-efl.spec index 6494a43..5f3746e 100644 --- a/tizen_src/packaging/chromium-efl.spec +++ b/tizen_src/packaging/chromium-efl.spec @@ -40,9 +40,6 @@ Source1: content_shell.in %if "%{tizen}" == "2.0" %define chromium_efl_tizen_version 2.3 %endif -%if "%{tizen}" == "2.2.1" -%define chromium_efl_tizen_version 2.2.1 -%endif %if %{!?TIZEN_PROFILE_TV:0}%{?TIZEN_PROFILE_TV:1} || "%{!?profile:0}%{?profile}" == "tv" %define chromium_efl_tizen_profile tv diff --git a/tizen_src/packaging/crosswalk-bin.spec b/tizen_src/packaging/crosswalk-bin.spec index 1fc45c0..74eb18a 100644 --- a/tizen_src/packaging/crosswalk-bin.spec +++ b/tizen_src/packaging/crosswalk-bin.spec @@ -186,9 +186,6 @@ trap 'tizen_src/build/apply_patches.sh -r --crosswalk-bin' EXIT %if "%{tizen}" == "2.0" %define chromium_efl_tizen_version 2.3 %endif -%if "%{tizen}" == "2.2.1" -%define chromium_efl_tizen_version 2.2.1 -%endif %if %{!?TIZEN_PROFILE_TV:0}%{?TIZEN_PROFILE_TV:1} || "%{!?profile:0}%{?profile}" == "tv" %define chromium_efl_tizen_profile tv diff --git a/tizen_src/supplement.gypi b/tizen_src/supplement.gypi index 605dbaa..7c19228 100644 --- a/tizen_src/supplement.gypi +++ b/tizen_src/supplement.gypi @@ -153,13 +153,6 @@ 'TIZEN_PATCH_VERSION=0', ], }], - ['chromium_efl_tizen_version=="2.2.1"', { - 'defines': [ - 'TIZEN_MAJOR_VERSION=2', - 'TIZEN_MINOR_VERSION=2', - 'TIZEN_PATCH_VERSION=1', - ], - }], ['use_wayland==1', { 'defines': [ 'USE_WAYLAND=1', @@ -190,11 +183,6 @@ 'WTF_OS_TIZEN_TV=1', ], 'conditions': [ - ['chromium_efl_tizen_version=="2.2.1"', { - 'defines': [ - 'TIZEN_MULTIMEDIA_PIXMAP_SUPPORT=1', - ], - }], ['chromium_efl_tizen_version=="2.4"', { # The tizen v2.4 tv build gets its cpu-specific flags from the Tizen build system. 'cflags!': [ -- 2.7.4