From 2f108dbacb161091e42a3479f4e171339b7e7623 Mon Sep 17 00:00:00 2001 From: Eurogiciel-BOT Date: Tue, 27 May 2014 07:22:48 +0000 Subject: [PATCH 1/1] Upstream version 7.35.144.0 Upstream commit-id de3dcab52bab0a2148358c46851c7f11e65aad85 Change-Id: I46f72bdfd7a2660192d89a1606d0e4ce15571d36 Signed-off-by: Eurogiciel-BOT --- packaging/crosswalk.spec | 20 +++++++++++++++++++- src/xwalk/VERSION | 2 +- src/xwalk/app/OWNERS | 1 + src/xwalk/build/android/OWNERS | 1 + src/xwalk/packaging/crosswalk.spec | 20 +++++++++++++++++++- src/xwalk/runtime/android/OWNERS | 1 + src/xwalk/runtime/app/android/OWNERS | 1 + src/xwalk/runtime/browser/android/OWNERS | 1 + src/xwalk/runtime/common/android/OWNERS | 1 + src/xwalk/runtime/renderer/android/OWNERS | 1 + src/xwalk/test/android/OWNERS | 1 + src/xwalk/tizen/mobile/sensor/sensor_provider.cc | 5 ++++- src/xwalk/tizen/mobile/sensor/sensor_provider.h | 2 ++ .../tizen/mobile/sensor/tizen_platform_sensor.cc | 6 ++++++ 14 files changed, 59 insertions(+), 4 deletions(-) diff --git a/packaging/crosswalk.spec b/packaging/crosswalk.spec index 29b4858..fe8d704 100644 --- a/packaging/crosswalk.spec +++ b/packaging/crosswalk.spec @@ -12,7 +12,7 @@ %endif Name: crosswalk -Version: 7.35.143.0 +Version: 7.35.144.0 Release: 0 Summary: Crosswalk is an app runtime based on Chromium License: (BSD-3-Clause and LGPL-2.1+) @@ -166,6 +166,24 @@ GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Ddisable_nacl=%{_disable_nacl}" GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Ddisable_fatal_linker_warnings=1" %endif +# For building for arm in OBS, we need : +# -> to unset sysroot value. +# sysroot variable is automatically set for cross compilation to use arm-sysroot provided by Chromium project +# -> to force system ld binary. +# Indeed the build is made on Emulated / Virtualized environment that correspond +# to the target. +# gold ld used is avaible only for 32/64 bits Intel Arch. +# sysroot usage is not needed, we need to use arm libraries from the virtualized environment. +# +# Crosswalk build fails if the fpu selected in the gcc option is different from neon in case of arm7 compilation +# So force it. +%ifarch %{arm} +GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Dsysroot= -Dlinux_use_gold_binary=0" +export CFLAGS=`echo $CFLAGS | sed s,-mfpu=vfpv3,-mfpu=neon,g` +export CXXFLAGS=`echo $CXXFLAGS | sed s,-mfpu=vfpv3,-mfpu=neon,g` +export FFLAGS=`echo $FFLAGS | sed s,-mfpu=vfpv3,-mfpu=neon,g` +%endif + # --no-parallel is added because chroot does not mount a /dev/shm, this will # cause python multiprocessing.SemLock error. export GYP_GENERATORS='ninja' diff --git a/src/xwalk/VERSION b/src/xwalk/VERSION index a9f49de..fcaf10f 100644 --- a/src/xwalk/VERSION +++ b/src/xwalk/VERSION @@ -1,4 +1,4 @@ MAJOR=7 MINOR=35 -BUILD=143 +BUILD=144 PATCH=0 diff --git a/src/xwalk/app/OWNERS b/src/xwalk/app/OWNERS index 8173fca..e4cd758 100644 --- a/src/xwalk/app/OWNERS +++ b/src/xwalk/app/OWNERS @@ -1 +1,2 @@ +shiliu.wang@intel.com yongsheng.zhu@intel.com diff --git a/src/xwalk/build/android/OWNERS b/src/xwalk/build/android/OWNERS index 765f1ad..076654b 100644 --- a/src/xwalk/build/android/OWNERS +++ b/src/xwalk/build/android/OWNERS @@ -1,4 +1,5 @@ girish.ramakrishnan@intel.com +shiliu.wang@intel.com shouqun.liu@intel.com xingnan.wang@intel.com yongsheng.zhu@intel.com diff --git a/src/xwalk/packaging/crosswalk.spec b/src/xwalk/packaging/crosswalk.spec index 29b4858..fe8d704 100644 --- a/src/xwalk/packaging/crosswalk.spec +++ b/src/xwalk/packaging/crosswalk.spec @@ -12,7 +12,7 @@ %endif Name: crosswalk -Version: 7.35.143.0 +Version: 7.35.144.0 Release: 0 Summary: Crosswalk is an app runtime based on Chromium License: (BSD-3-Clause and LGPL-2.1+) @@ -166,6 +166,24 @@ GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Ddisable_nacl=%{_disable_nacl}" GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Ddisable_fatal_linker_warnings=1" %endif +# For building for arm in OBS, we need : +# -> to unset sysroot value. +# sysroot variable is automatically set for cross compilation to use arm-sysroot provided by Chromium project +# -> to force system ld binary. +# Indeed the build is made on Emulated / Virtualized environment that correspond +# to the target. +# gold ld used is avaible only for 32/64 bits Intel Arch. +# sysroot usage is not needed, we need to use arm libraries from the virtualized environment. +# +# Crosswalk build fails if the fpu selected in the gcc option is different from neon in case of arm7 compilation +# So force it. +%ifarch %{arm} +GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Dsysroot= -Dlinux_use_gold_binary=0" +export CFLAGS=`echo $CFLAGS | sed s,-mfpu=vfpv3,-mfpu=neon,g` +export CXXFLAGS=`echo $CXXFLAGS | sed s,-mfpu=vfpv3,-mfpu=neon,g` +export FFLAGS=`echo $FFLAGS | sed s,-mfpu=vfpv3,-mfpu=neon,g` +%endif + # --no-parallel is added because chroot does not mount a /dev/shm, this will # cause python multiprocessing.SemLock error. export GYP_GENERATORS='ninja' diff --git a/src/xwalk/runtime/android/OWNERS b/src/xwalk/runtime/android/OWNERS index 765f1ad..076654b 100644 --- a/src/xwalk/runtime/android/OWNERS +++ b/src/xwalk/runtime/android/OWNERS @@ -1,4 +1,5 @@ girish.ramakrishnan@intel.com +shiliu.wang@intel.com shouqun.liu@intel.com xingnan.wang@intel.com yongsheng.zhu@intel.com diff --git a/src/xwalk/runtime/app/android/OWNERS b/src/xwalk/runtime/app/android/OWNERS index 765f1ad..076654b 100644 --- a/src/xwalk/runtime/app/android/OWNERS +++ b/src/xwalk/runtime/app/android/OWNERS @@ -1,4 +1,5 @@ girish.ramakrishnan@intel.com +shiliu.wang@intel.com shouqun.liu@intel.com xingnan.wang@intel.com yongsheng.zhu@intel.com diff --git a/src/xwalk/runtime/browser/android/OWNERS b/src/xwalk/runtime/browser/android/OWNERS index 765f1ad..076654b 100644 --- a/src/xwalk/runtime/browser/android/OWNERS +++ b/src/xwalk/runtime/browser/android/OWNERS @@ -1,4 +1,5 @@ girish.ramakrishnan@intel.com +shiliu.wang@intel.com shouqun.liu@intel.com xingnan.wang@intel.com yongsheng.zhu@intel.com diff --git a/src/xwalk/runtime/common/android/OWNERS b/src/xwalk/runtime/common/android/OWNERS index 765f1ad..076654b 100644 --- a/src/xwalk/runtime/common/android/OWNERS +++ b/src/xwalk/runtime/common/android/OWNERS @@ -1,4 +1,5 @@ girish.ramakrishnan@intel.com +shiliu.wang@intel.com shouqun.liu@intel.com xingnan.wang@intel.com yongsheng.zhu@intel.com diff --git a/src/xwalk/runtime/renderer/android/OWNERS b/src/xwalk/runtime/renderer/android/OWNERS index 765f1ad..076654b 100644 --- a/src/xwalk/runtime/renderer/android/OWNERS +++ b/src/xwalk/runtime/renderer/android/OWNERS @@ -1,4 +1,5 @@ girish.ramakrishnan@intel.com +shiliu.wang@intel.com shouqun.liu@intel.com xingnan.wang@intel.com yongsheng.zhu@intel.com diff --git a/src/xwalk/test/android/OWNERS b/src/xwalk/test/android/OWNERS index 8173fca..e4cd758 100644 --- a/src/xwalk/test/android/OWNERS +++ b/src/xwalk/test/android/OWNERS @@ -1 +1,2 @@ +shiliu.wang@intel.com yongsheng.zhu@intel.com diff --git a/src/xwalk/tizen/mobile/sensor/sensor_provider.cc b/src/xwalk/tizen/mobile/sensor/sensor_provider.cc index 72eeba1..379ddb3 100644 --- a/src/xwalk/tizen/mobile/sensor/sensor_provider.cc +++ b/src/xwalk/tizen/mobile/sensor/sensor_provider.cc @@ -9,8 +9,11 @@ namespace xwalk { +// static +bool SensorProvider::initialized_ = false; + SensorProvider* SensorProvider::GetInstance() { - if (!instance_) { + if (!initialized_) { instance_.reset(new TizenPlatformSensor()); if (!instance_->Initialize()) instance_.reset(); diff --git a/src/xwalk/tizen/mobile/sensor/sensor_provider.h b/src/xwalk/tizen/mobile/sensor/sensor_provider.h index c121f1e..c7d03ed 100644 --- a/src/xwalk/tizen/mobile/sensor/sensor_provider.h +++ b/src/xwalk/tizen/mobile/sensor/sensor_provider.h @@ -36,6 +36,8 @@ class SensorProvider { return last_rotation_; } + static bool initialized_; + protected: SensorProvider(); diff --git a/src/xwalk/tizen/mobile/sensor/tizen_platform_sensor.cc b/src/xwalk/tizen/mobile/sensor/tizen_platform_sensor.cc index 17e1df9..c3547e9 100644 --- a/src/xwalk/tizen/mobile/sensor/tizen_platform_sensor.cc +++ b/src/xwalk/tizen/mobile/sensor/tizen_platform_sensor.cc @@ -22,6 +22,12 @@ TizenPlatformSensor::~TizenPlatformSensor() { } bool TizenPlatformSensor::Initialize() { + // If the sensors couldn't be able to connect normally for the first time, + // it indicates that the platform doesn't support these sensors. + // Set |initialized_| true to make this function is called only + // once and avoid connecting to platform sensors repeatedly. + initialized_ = true; + unsigned long rotation; // NOLINT if (!sf_check_rotation(&rotation)) { last_rotation_ = ToDisplayRotation(static_cast(rotation)); -- 2.7.4