From 5a304a9adb834afc946c949cf8538a4f8b5d7cdd Mon Sep 17 00:00:00 2001
From: Andras Becsi <andras.becsi@digia.com>
Date: Tue, 4 Feb 2014 17:12:25 +0100
Subject: 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>
---
 src/core/qtwebengine.gypi | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

(limited to 'src/core/qtwebengine.gypi')

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',
-- 
cgit v1.2.3