[M40] Hot-fix link error of "undefined reference to `WebRtc_GetCPUFeaturesARM'"

Patch hot-fixes it by providing the function definition for tizen mobile&tv.

Bug: http://107.108.218.239/bugzilla/show_bug.cgi?id=8410
Reviewed by: Antonio Gomes, Kangil Han, Piotr Tworek, SeungSeop Park, Tomasz Olszak

Change-Id: I55f061ca2ed063802e1caf0945a8f49b1730952e
Signed-off-by: SeungSeop Park <sns.park@samsung.com>

diff --git a/tizen_src/impl/chromium-efl.gyp b/tizen_src/impl/chromium-efl.gyp
index f89a841e72871249d57573b910d4afa45dc88cdd..ccf82d417e2632efa36d84c9f6a4e76fc6e0d4c9 100644 (file)
--- a/tizen_src/impl/chromium-efl.gyp
+++ b/tizen_src/impl/chromium-efl.gyp
@@ -333,6 +333,9 @@
       'wrt/dynamicplugin.h',
       'wrt/wrtwidget.cc',
       'wrt/wrtwidget.h',
+
+      # Temporary fix for M40 build
+      'third_party/webrtc/system_wrappers/source/cpu_features_tizen.c',
     ],
     'cflags!': [
       # Symbol visibility controled by chromium-efl.filter

diff --git a/tizen_src/impl/chromium-efl.gypi b/tizen_src/impl/chromium-efl.gypi
index b40aeaa9d1c062032dcef0f5b2b4710666a1ec5b..0a0717dc7efcc61692e65497f6fa0c27b259fe86 100644 (file)
--- a/tizen_src/impl/chromium-efl.gypi
+++ b/tizen_src/impl/chromium-efl.gypi
@@ -53,7 +53,7 @@
          'sources/': [
            ['exclude', 'browser/device_sensors/data_fetcher_shared_memory_default.cc$'],
          ],
-      }, {
+      }, { # building_for_tizen != 1
         'sources/': [
           ['exclude', 'browser/device_sensors/data_fetcher_impl_tizen\\.(cc|h)$'],
           ['exclude', 'browser/device_sensors/data_fetcher_shared_memory_tizen\\.cc$'],
@@ -62,9 +62,10 @@
           ['exclude', 'browser/motion/wkext_motion\\.(h|cc)$'],
 #          ['exclude', 'browser/media/tizen/webaudio_decoder_browser_tizen\\.(h|cc)$'],
   #        ['exclude', 'renderer/media/tizen/audio_decoder_tizen\\.(h|cc)$'],
+          ['exclude', 'third_party/webrtc/system_wrappers/source/cpu_features_tizen.c'],
         ],
       }],
-      ['building_for_tizen==1 and building_for_tizen_mobile==1', {
+      ['building_for_tizen_mobile==1', {
          'defines': [
            'OS_TIZEN_MOBILE=1',
            'TIZEN_CONTENTS_DETECTION=1',
@@ -74,7 +75,7 @@
                                      # Remove this line after a more proper solution is found.
            ],
       }],
-      ['building_for_tizen==1 and building_for_tizen_tv==1', {
+      ['building_for_tizen_tv==1', {
        'defines': [
           'OS_TIZEN_TV=1'
         ],

diff --git a/tizen_src/impl/third_party/webrtc/system_wrappers/source/cpu_features_tizen.c b/tizen_src/impl/third_party/webrtc/system_wrappers/source/cpu_features_tizen.c
new file mode 100644 (file)
index 0000000..506f911
--- /dev/null
+++ b/tizen_src/impl/third_party/webrtc/system_wrappers/source/cpu_features_tizen.c
@@ -0,0 +1,24 @@
+/*
+ *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include <inttypes.h>
+
+// defined in third_party/webrtc/system_wrappers/interface/cpu_features_wrapper.h
+enum {
+  kCPUFeatureARMv7       = (1 << 0),
+  kCPUFeatureVFPv3       = (1 << 1),
+  kCPUFeatureNEON        = (1 << 2),
+  kCPUFeatureLDREXSTREX  = (1 << 3)
+};
+
+// TODO: Need proper implementation.
+uint64_t WebRtc_GetCPUFeaturesARM(void) {
+  return kCPUFeatureARMv7 | kCPUFeatureNEON;
+}