diff options
| author | Ivo van Dongen <info@ivovandongen.nl> | 2016-07-01 11:30:30 +0200 |
|---|---|---|
| committer | Ivo van Dongen <info@ivovandongen.nl> | 2016-07-07 10:08:44 +0200 |
| commit | 433378ee66ffbf64edc39eb930430b48958bfa50 (patch) | |
| tree | 27e3fa12b5b28e7ee059e00788fef6fbbd992186 | |
| parent | 360469428d03a4d2d8172458e1dd85024e45fee3 (diff) | |
| download | qtlocation-mapboxgl-433378ee66ffbf64edc39eb930430b48958bfa50.tar.gz | |
[android] #5456 - re-use loop_lib var instead of target_platform in gyp
| -rw-r--r-- | platform/android/platform.gyp | 1 | ||||
| -rw-r--r-- | test/test.gypi | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/platform/android/platform.gyp b/platform/android/platform.gyp index da9d518928..137d9c67fe 100644 --- a/platform/android/platform.gyp +++ b/platform/android/platform.gyp @@ -1,6 +1,5 @@ { 'variables': { - 'target_platform': 'android', 'loop_lib': 'android', 'headless_lib': 'none', 'coverage': 0, diff --git a/test/test.gypi b/test/test.gypi index ed08b48427..57d7412f22 100644 --- a/test/test.gypi +++ b/test/test.gypi @@ -128,7 +128,7 @@ }], #Exclude tests that don't run on android yet - ['target_platform == "android"', { + ['loop_lib == "android"', { 'sources!': ['util/async_task.cpp'], # Doesn't compile?? 'sources/': [ ['exclude', 'util/.*(hpp|cpp)$'], @@ -155,7 +155,7 @@ }], #Android doesn't support -pthread - ['target_platform == "android"', { + ['loop_lib == "android"', { 'libraries!': ['<@(gtest_ldflags)'] }] ], @@ -183,7 +183,7 @@ } }, { 'conditions': [ - ['target_platform != "android"', { + ['loop_lib != "android"', { 'link_settings': { 'ldflags': [ '-Wl,-whole-archive <(PRODUCT_DIR)/libtest-lib.a -Wl,-no-whole-archive', |