From e67ed501bcb89b1da0df8fba8479ca964c6d284a Mon Sep 17 00:00:00 2001 From: Piotr Tworek Date: Thu, 9 Apr 2015 18:25:46 +0200 Subject: [PATCH] Use auto generated instead of hardcoded chromium version number. Since we want to emulate chrome behaviour and provide UA version number in UA string, let's make sure the version is correct. Change-Id: I5a9591d14cf3263c23a6461c0680bb2557de11f6 Signed-off-by: Piotr Tworek --- tizen_src/ewk/efl_integration/common/version_info.cc | 2 +- tizen_src/ewk/efl_integration/efl_integration.gypi | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/tizen_src/ewk/efl_integration/common/version_info.cc b/tizen_src/ewk/efl_integration/common/version_info.cc index 2d098e0..5c8e7c1 100644 --- a/tizen_src/ewk/efl_integration/common/version_info.cc +++ b/tizen_src/ewk/efl_integration/common/version_info.cc @@ -116,7 +116,7 @@ std::string VersionInfo::ProductNameAndVersionForUserAgent() const { // See http://crbug.com/297522 // Does we need to open our real version number? // or just use 33.0.0.0 as Chromium does. - return std::string("Chrome/34.0.1847.76 ") + + return std::string("Chrome/" CHROMIUM_VERSION " ") + Name() + std::string("/") + Version(); diff --git a/tizen_src/ewk/efl_integration/efl_integration.gypi b/tizen_src/ewk/efl_integration/efl_integration.gypi index 1a5096c..a708f08 100644 --- a/tizen_src/ewk/efl_integration/efl_integration.gypi +++ b/tizen_src/ewk/efl_integration/efl_integration.gypi @@ -5,6 +5,11 @@ { 'variables': { 'edje_compiler%': 'edje_cc', + + # Components used to auto generate CHROMIUM_VERSION preprocessor define. + 'version_file' : '<(DEPTH)/chrome/VERSION', + 'version_script' : '<(DEPTH)/build/util/version.py', + 'version_pattern': '@MAJOR@.@MINOR@.@BUILD@.@PATCH@', }, 'targets': [{ @@ -57,6 +62,7 @@ # TODO: Autofill has changed significantly in M42 compared to # M40. Disable it until it is fixed. #'TIZEN_AUTOFILL_SUPPORT=1', + 'CHROMIUM_VERSION=\"