Commit 5a94bc9a authored by Zeno Albisser's avatar Zeno Albisser Committed by The Qt Project
Browse files

Add qt_os embedded_linux for platform specific configuration.


Change-Id: I2c7878b0f5a84bc299d6c033a69e1f2f904168f3
Reviewed-by: default avatarJocelyn Turcotte <jocelyn.turcotte@digia.com>
Reviewed-by: default avatarAndras Becsi <andras.becsi@digia.com>
Showing with 15 additions and 6 deletions
...@@ -25,6 +25,10 @@ cross_compile { ...@@ -25,6 +25,10 @@ cross_compile {
"-D android_ndk_root=\"$${TOOLCHAIN_SYSROOT}\" -D android_product_out=\"$${ANDROID_PRODUCT_OUT}\"" "-D android_ndk_root=\"$${TOOLCHAIN_SYSROOT}\" -D android_product_out=\"$${ANDROID_PRODUCT_OUT}\""
} }
linux {
GYP_ARGS += "-D qt_os=\"embedded_linux\""
}
!isEmpty(TOOLCHAIN_SYSROOT): GYP_ARGS += "-D sysroot=\"$${TOOLCHAIN_SYSROOT}\"" !isEmpty(TOOLCHAIN_SYSROOT): GYP_ARGS += "-D sysroot=\"$${TOOLCHAIN_SYSROOT}\""
contains(QT_ARCH, "arm") { contains(QT_ARCH, "arm") {
......
...@@ -46,7 +46,17 @@ ...@@ -46,7 +46,17 @@
'<(chromium_src_dir)/base/allocator/allocator.gyp:allocator', '<(chromium_src_dir)/base/allocator/allocator.gyp:allocator',
], ],
}], }],
['_toolset=="target" and qt_os=="android"', { # android and embedded_linux need some special flags.
['qt_os=="embedded_linux" or qt_os=="android"', {
'conditions': [
['qt_os=="android"', {
'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',
],
}],
],
'configurations': { 'configurations': {
'Debug_Base': { 'Debug_Base': {
# Reduce the binary size. # Reduce the binary size.
...@@ -68,11 +78,6 @@ ...@@ -68,11 +78,6 @@
], ],
}, },
}, },
'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"', { ['OS=="win"', {
'resource_include_dirs': [ 'resource_include_dirs': [
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment