diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-02-04 17:12:25 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-05 15:51:30 +0100 |
| commit | 5a304a9adb834afc946c949cf8538a4f8b5d7cdd (patch) | |
| tree | d97b5d3e34d926c9d05c57d310dd41e3dfd4a754 /src/core/qtwebengine.gypi | |
| parent | ecaab295f96e3d12fc952c49d35a6eb32f72aba1 (diff) | |
Fix the embedded build
Adopt to toolchain changes and fix the build with the
current snapshot.
This patch adds some missing overrides and build system
configurations.
Change-Id: I488929500347bdb5a077ac14e9553cedfcaa605d
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'src/core/qtwebengine.gypi')
| -rw-r--r-- | src/core/qtwebengine.gypi | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/src/core/qtwebengine.gypi b/src/core/qtwebengine.gypi index 394f087fc..d1415f3f6 100644 --- a/src/core/qtwebengine.gypi +++ b/src/core/qtwebengine.gypi @@ -55,6 +55,34 @@ '<(chromium_src_dir)/base/allocator/allocator.gyp:allocator', ], }], + ['_toolset=="target" and qt_os=="android"', { + 'configurations': { + 'Debug_Base': { + # Reduce the binary size. + 'variables': { + 'debug_optimize%': 's', + }, + 'ldflags': [ + # Only link with needed input sections. + '-Wl,--gc-sections', + # Warn in case of text relocations. + '-Wl,--warn-shared-textrel', + '-Wl,-O1', + '-Wl,--as-needed', + ], + 'cflags': [ + '-fomit-frame-pointer', + '-fdata-sections', + '-ffunction-sections', + ], + }, + }, + 'dependencies': [ + '<(chromium_src_dir)/third_party/ashmem/ashmem.gyp:ashmem', + '<(chromium_src_dir)/third_party/freetype/freetype.gyp:ft2', + '<(chromium_src_dir)/third_party/android_tools/ndk/android_tools_ndk.gyp:cpu_features', + ], + }], ['OS=="win"', { 'resource_include_dirs': [ '<(SHARED_INTERMEDIATE_DIR)/webkit', |