diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2017-08-30 12:44:49 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-08-30 11:41:34 +0000 |
| commit | efed63dc0117c6397d832c0d233af0dbb9b6adc0 (patch) | |
| tree | 005149170cb4b84e234086fb12f7732e68c257cd /tests/auto/blackbox/testdata-android | |
| parent | a91bf40e89f6cd3915bca5229efe707d96241a0b (diff) | |
Android: Fix teapot autotest for older NDKs
Change-Id: Idf963fd5fd5f0be6a4e081922c089f78735fc095
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'tests/auto/blackbox/testdata-android')
| -rw-r--r-- | tests/auto/blackbox/testdata-android/teapot/teapot.qbs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/blackbox/testdata-android/teapot/teapot.qbs b/tests/auto/blackbox/testdata-android/teapot/teapot.qbs index 47952d3d3..167d4462b 100644 --- a/tests/auto/blackbox/testdata-android/teapot/teapot.qbs +++ b/tests/auto/blackbox/testdata-android/teapot/teapot.qbs @@ -68,7 +68,8 @@ Project { property string samplesDir: Android.ndk.ndkSamplesDir property string jniDir configure: { - var paths = ["/teapots/classic-teapot/src/main/cpp/", "/Teapot/app/src/main/jni/"]; + var paths = ["/teapots/classic-teapot/src/main/cpp/", "/Teapot/app/src/main/jni/", + "/Teapot/jni/"]; for (var i = 0; i < paths.length; ++i) { if (File.exists(samplesDir + paths[i])) { jniDir = samplesDir + paths[i]; @@ -102,7 +103,7 @@ Project { property string samplesDir: Android.sdk.ndkSamplesDir property string dir configure: { - var paths = ["/teapots/classic-teapot/src/main", "/Teapot/app/src/main"]; + var paths = ["/teapots/classic-teapot/src/main", "/Teapot/app/src/main", "/Teapot"]; for (var i = 0; i < paths.length; ++i) { if (File.exists(samplesDir + paths[i])) { dir = samplesDir + paths[i]; |