diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-19 00:02:16 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-19 00:02:16 +0200 |
commit | 2ba0e25a0c6fee7e2144f1fc8b577f73e1155e6d (patch) | |
tree | 504e526cbb840733a316714c890fb25d1d64eb1c /src/core/qtwebengine.gypi | |
parent | 2c246e60e886b082e7438cf8f68cdc22bc919fd9 (diff) | |
parent | f5ec28285ab7f71d6d75af963ae499603da6630e (diff) |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I78c25caf30923fc1101b137f9abc3993e3cf0600
Diffstat (limited to 'src/core/qtwebengine.gypi')
-rw-r--r-- | src/core/qtwebengine.gypi | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/core/qtwebengine.gypi b/src/core/qtwebengine.gypi index cb9ea435b..15da6b6ec 100644 --- a/src/core/qtwebengine.gypi +++ b/src/core/qtwebengine.gypi @@ -55,18 +55,8 @@ '<(chromium_src_dir)/base/allocator/allocator.gyp:allocator', ], }], - # embedded_android and embedded_linux need some additional options. - ['qt_os=="embedded_linux" or qt_os=="embedded_android"', { - 'conditions': [ - ['qt_os=="embedded_android"', { - 'dependencies': [ - '<(chromium_src_dir)/ui/ozone/ozone.gyp:ozone_base', - '<(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', - ], - }], - ], + # embedded_linux need some additional options. + ['qt_os=="embedded_linux"', { 'configurations': { 'Debug_Base': { # Reduce the binary size. |