[Tizen] Fix Tizen build

SSIA. The patch can work after the following are applied: crosswalk-project/chromium-crosswalk#159 crosswalk-project/chromium-crosswalk#158
pozdnyakov · May 21, 2014 · e8a8430 · e8a8430
1 parent deffd9a
commit e8a8430
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 27 deletions.
diff --git a/DEPS.xwalk b/DEPS.xwalk
@@ -7,7 +7,7 @@
 # Use 'Trunk' for trunk.
 # If using trunk, will use '.DEPS.git' for gclient.
 chromium_version = '36.0.1976.2'
-chromium_crosswalk_point = 'b66168681fbb2b6755dfc2ec0bd308f73522222c'
+chromium_crosswalk_point = '7ae8aaa78c8bdde4aadcae4d8dd0808f5103a11e'
 blink_crosswalk_point = '287dababee55833dddecc1ecd31aa267a08f08f7'
 v8_crosswalk_point = 'c8e8806f9e54a027d667425f1bb1b28cf9cbb6f7'
 ozone_wayland_point = 'f4faec532d7d2f482b3ffe1e52be6fa3e6fc8629'

diff --git a/packaging/crosswalk-do-not-look-for-gtk2-when-using-aura.patch b/packaging/crosswalk-do-not-look-for-gtk2-when-using-aura.patch
diff --git a/packaging/crosswalk.spec b/packaging/crosswalk.spec
@@ -25,7 +25,6 @@ Source3:        xwalk.service.in
 Source1001:     crosswalk.manifest
 Source1002:     %{name}.xml.in
 Source1003:     %{name}.png
-Patch1:         %{name}-do-not-look-for-gtk2-when-using-aura.patch
 Patch9:         Blink-Add-GCC-flag-Wno-narrowing-fix-64bits-build.patch
 
 BuildRequires:  bison

diff --git a/runtime/browser/xwalk_browser_main_parts_tizen.cc b/runtime/browser/xwalk_browser_main_parts_tizen.cc
@@ -17,7 +17,7 @@
 #include "ui/gl/gl_switches.h"
 #include "ui/gfx/switches.h"
 
-#include "content/browser/device_orientation/device_inertial_sensor_service.h"
+#include "content/browser/device_sensors/device_inertial_sensor_service.h"
 #include "xwalk/runtime/extension/screen_orientation_extension.h"
 #include "xwalk/tizen/mobile/sensor/tizen_data_fetcher_shared_memory.h"
 

diff --git a/runtime/renderer/tizen/xwalk_content_renderer_client_tizen.cc b/runtime/renderer/tizen/xwalk_content_renderer_client_tizen.cc
@@ -7,7 +7,7 @@
 #include <string>
 
 #include "base/files/file_path.h"
-#include "net/base/net_util.h"
+#include "net/base/filename_util.h"
 #include "url/gurl.h"
 #include "xwalk/application/common/constants.h"
 #include "third_party/WebKit/public/web/WebFrame.h"

diff --git a/tizen/mobile/sensor/tizen_data_fetcher_shared_memory.h b/tizen/mobile/sensor/tizen_data_fetcher_shared_memory.h
@@ -5,7 +5,7 @@
 #ifndef XWALK_TIZEN_MOBILE_SENSOR_TIZEN_DATA_FETCHER_SHARED_MEMORY_H_
 #define XWALK_TIZEN_MOBILE_SENSOR_TIZEN_DATA_FETCHER_SHARED_MEMORY_H_
 
-#include "content/browser/device_orientation/data_fetcher_shared_memory.h"
+#include "content/browser/device_sensors/data_fetcher_shared_memory.h"
 #include "xwalk/tizen/mobile/sensor/sensor_provider.h"
 
 namespace xwalk {