CONF_FLAG="--conf ${SCRIPTDIR}/gbs.conf"
fi
-CUSTOM_LIBC_DIR="custom_libc_dir /opt/usr/eglibc-2.18/lib"
-
gbs $CONF_FLAG build $PROFILE_FLAG -A armv7l --incremental \
- --define "${CUSTOM_LIBC_DIR}" \
--define "${TIZEN_VERSION}" "$@"
${SCRIPTDIR}/apply_patches.sh -r ${SCRIPTDIR}/patches
[profile.tizenmb_v2.3]
obs = obs.tizenmb
# The order is IMPORTANT!
-repos = repo.tizenmb_supplement_gcc48, repo.tizenmb_supplement_v2.3, repo.tizenmb_supplement_chromium_v2.3, repo.tizenmb_base_v2.3
+repos = repo.tizenmb_supplement_v2.3, repo.tizenmb_supplement_chromium_v2.3, repo.tizenmb_base_v2.3
buildroot=~/GBS-ROOT-2.3-DEV
-[repo.tizenmb_supplement_gcc48]
-url = http://10.251.52.177/tizenrepo/eur-open/supplement_gcc48
-
[repo.tizenmb_supplement_v2.3]
url = http://10.251.52.177/tizenrepo/eur-open/supplement_v2.3
'efl_integration/public/text_encoding_map_efl.h',
],
'conditions': [
+ ['gcc_4_6_x==1', {
+ 'defines': [
+ 'override=',
+ 'final=',
+ ],
+ }],
['ewk_bringup==1', {
'defines': [ 'EWK_BRINGUP=1' ],
}]
class _Ewk_Certificate_Policy_Decision : public Ewk_Suspendable_Object {
public:
_Ewk_Certificate_Policy_Decision(const GURL& url, const std::string& cert, int error_code, const base::Callback<void(bool)>& result_callback)
- : Ewk_Suspendable_Object(result_callback),
+ : url_(NULL),
+ certificatePem_(NULL),
+ Ewk_Suspendable_Object(result_callback),
error_(error_code) {
url_ = eina_stringshare_add(url.spec().c_str());
certificatePem_ = eina_stringshare_add(cert.c_str());
int error() const { return error_; }
private:
- Eina_Stringshare* url_ = nullptr;
- Eina_Stringshare* certificatePem_ = nullptr;
+ Eina_Stringshare* url_;
+ Eina_Stringshare* certificatePem_;
int error_;
};
#include <Evas.h>
#include <Elementary.h>
-#include <Ecore_X.h>
+#include "ecore_x_wrapper.h"
namespace content {
class WebContentsDelegateEfl;
#include <Ecore.h>
#include <Ecore_Evas.h>
#include <Ecore_Input.h>
-#include <Ecore_X.h>
+#include "ecore_x_wrapper.h"
#include <Elementary.h>
#define EFL_MAX_WIDTH 10000
#include "ui/events/keycodes/keyboard_code_conversion_x.h"
#include <Ecore.h>
-#include <Ecore_X.h>
+#include "ecore_x_wrapper.h"
// TODO: Figure out how to avoid this includes.
#include <X11/Xutil.h>
#include <Elementary.h>
#include <libintl.h>
-#include <Ecore_X.h>
+#include "ecore_x_wrapper.h"
#ifdef OS_TIZEN_MOBILE
#include <dlfcn.h>
#include <efl_assist.h>
#include <Ecore.h>
#include <Ecore_Evas.h>
#include <Ecore_Input.h>
-#include <Ecore_X.h>
+#include "ecore_x_wrapper.h"
#include <Elementary.h>
namespace content {
['building_for_tizen==1', {
'clang': 0,
}],
+ ['building_for_tizen_mobile==1', {
+ 'gcc_4_6_x': 1,
+ }, {
+ 'gcc_4_6_x': 0,
+ }],
],
'chromium_efl_tizen_version%': '2.3',
'custom_libc_dir%': '',
['exclude', 'gesture_detection/gesture_configuration_default\\.cc$'],
],
}],
+ ['_target_name=="boringssl" or _target_name=="crypto" or _target_name=="genperf" or _target_name=="yasm" or _target_name=="speech_proto" or _target_name=="skia_library" or _target_name=="http_server" or _target_name=="libjingle" or _target_name=="libjingle_webrtc_common" or _target_name=="content_renderer"', {
+ 'defines!': [
+ 'final=',
+ ],
+ }],
+ ['_target_name=="usrsctplib"', {
+ 'defines!': [
+ 'override=',
+ ],
+ }],
+ ['_target_name=="webrtc_base" or _target_name=="rtc_base" or _target_name=="v8_base"', {
+ 'defines!': [
+ 'final=',
+ 'override=',
+ ],
+ }],
],
'conditions': [
['use_efl==1', {
'USE_EFL=1',
],
}],
+ ['gcc_4_6_x==1', {
+ 'defines': [
+ 'GCC_4_6_X=1',
+ 'override=',
+ 'final=',
+ ],
+ }],
['tizen_multimedia_support==1', {
'defines': [
'TIZEN_MULTIMEDIA_SUPPORT=1',
'OS_TIZEN=1',
'TIZEN_MULTIMEDIA_PIXMAP_SUPPORT=1',
'TIZEN_CAPI_PLAYER_SUPPORT=1',
+ # For GCC 4.5.3 bundled arm.h has a bug and don't define __ARM_PCS when it should.
+ # Force define this flag for the whole chromium on gbs gcc 4.5.3.
+ # Non-arm builds will ingore it in any case.
+ '__ARM_PCS',
],
'conditions': [
['chromium_efl_tizen_version=="2.3"', {
['exclude', 'browser/sound_effect.cc$'],
['exclude', 'battery_status_manager_linux\\.(h|cc)$'],
],
- }, { # building_for_tizen != 1
+ 'cflags_cc': [ '-std=gnu++0x', '-fpermissive' ],
+ }, {
'sources/': [
['exclude', 'browser/device_sensors/data_fetcher_impl_tizen\\.(cc|h)$'],
['exclude', 'browser/device_sensors/data_fetcher_shared_memory_tizen\\.cc$'],
],
}],
['building_for_tizen_tv==1', {
- 'defines': [
- 'OS_TIZEN_TV=1'
- ],
+ 'defines': ['OS_TIZEN_TV=1'],
}],
['host_arch=="arm"', {
'target_conditions': [
#include "content/common/cursors/webcursor.h"
#include "third_party/WebKit/public/platform/WebCursorInfo.h"
-#include <Ecore_X.h>
+#include "ecore_x_wrapper.h"
using namespace blink;
#include <string>
#include <Ecore.h>
-#include <Ecore_X.h>
+#include "ecore_x_wrapper.h"
#include "base/basictypes.h"
--- /dev/null
+// Copyright 2015 Samsung Electronics. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef ECORE_X_WRAPPER_H_
+#define ECORE_X_WRAPPER_H_
+
+#ifdef GCC_4_6_X
+#undef override
+#endif
+#include <Ecore_X.h>
+#ifdef GCC_4_6_X
+#define override
+#endif
+
+#endif
return true;
}
+#ifdef GCC_4_6_X
+#undef override
+#endif
bool EWebView::SetUserAgent(const char* userAgent) {
const content::NavigationController& controller =
web_contents_->GetController();
return true;
}
+#ifdef GCC_4_6_X
+#define override
+#endif
bool EWebView::SetUserAgentAppName(const char* application_name) {
EflWebView::VersionInfo::GetInstance()->
#undef GetXDisplay
#undef OpenNewXDisplay
-#include <Ecore_X.h>
+#include "ecore_x_wrapper.h"
#include <X11/Xlib.h>
namespace gfx {
--- /dev/null
+// Copyright 2015 Samsung Electronics. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef GOOGLE_STREAMING_API_PB_WRAPPER_H_
+#define GOOGLE_STREAMING_API_PB_WRAPPER_H_
+
+#ifdef GCC_4_6_X
+#undef final
+#endif
+#include "content/browser/speech/proto/google_streaming_api.pb.h"
+#ifdef GCC_4_6_X
+#define final
+#endif
+
+#endif
#if defined(TIZEN_MULTIMEDIA_PIXMAP_SUPPORT)
#include <Ecore.h>
-#include <Ecore_X.h>
+#include "ecore_x_wrapper.h"
#endif
#include "base/memory/scoped_ptr.h"
#include <map>
#include <Ecore.h>
-#include <Ecore_X.h>
+#include "ecore_x_wrapper.h"
#include <gst/gst.h>
#include "base/cancelable_callback.h"
--- /dev/null
+// Copyright 2015 Samsung Electronics. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef OPENSSL_EVP_WRAPPER_H_
+#define OPENSSL_EVP_WRAPPER_H_
+
+#ifdef GCC_4_6_X
+#undef final
+#endif
+#include <openssl/evp.h>
+#ifdef GCC_4_6_X
+#define final
+#endif
+
+#endif
--- /dev/null
+// Copyright 2015 Samsung Electronics. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef OPENSSL_PEM_WRAPPER_H_
+#define OPENSSL_PEM_WRAPPER_H_
+
+#ifdef GCC_4_6_X
+#undef final
+#endif
+#include <openssl/pem.h>
+#ifdef GCC_4_6_X
+#define final
+#endif
+
+#endif
--- /dev/null
+// Copyright 2015 Samsung Electronics. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef OPENSSL_SSL_WRAPPER_H_
+#define OPENSSL_SSL_WRAPPER_H_
+
+#ifdef GCC_4_6_X
+#undef final
+#endif
+#include <openssl/ssl.h>
+#ifdef GCC_4_6_X
+#define final
+#endif
+
+#endif
--- /dev/null
+// Copyright 2015 Samsung Electronics. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef OPENSSL_X509_WRAPPER_H_
+#define OPENSSL_X509_WRAPPER_H_
+
+#ifdef GCC_4_6_X
+#undef final
+#endif
+#include <openssl/x509.h>
+#ifdef GCC_4_6_X
+#define final
+#endif
+
+#endif
--- /dev/null
+// Copyright 2015 Samsung Electronics. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef OPENSSL_X509V3_WRAPPER_H_
+#define OPENSSL_X509V3_WRAPPER_H_
+
+#ifdef GCC_4_6_X
+#undef final
+#endif
+#include <openssl/x509v3.h>
+#ifdef GCC_4_6_X
+#define final
+#endif
+
+#endif
projects / platform / framework / web / chromium-efl.git / commitdiff