Add properties to indicate the Android NDK samples directory

This was removed from the actual NDK in r11, and so can be set to the
external googlesamples/android-ndk repository on github.com.

Change-Id: Ie47883ebd003c119583b4a3321041ebbbf401029
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

1 files changed, 33 insertions, 2 deletions

diff --git a/tests/auto/blackbox/testdata-java/android/teapot/teapot.qbs b/tests/auto/blackbox/testdata-java/android/teapot/teapot.qbs
index dbacef92d..ff3077335 100644
--- a/tests/auto/blackbox/testdata-java/android/teapot/teapot.qbs
+++ b/tests/auto/blackbox/testdata-java/android/teapot/teapot.qbs
@@ -1,4 +1,5 @@
 import qbs
+import qbs.File
 
 Project {
     minimumQbsVersion: qbs.version
@@ -62,9 +63,24 @@ Project {
         Depends { name: "native-glue" }
         Depends { name: "ndk-helper" }
 
+        Probe {
+            id: teapotProbeJni
+            property string samplesDir: Android.ndk.ndkSamplesDir
+            property string jniDir
+            configure: {
+                var paths = ["/teapots/classic-teapot/src/main/cpp/", "/Teapot/app/src/main/jni/"];
+                for (var i = 0; i < paths.length; ++i) {
+                    if (File.exists(samplesDir + paths[i])) {
+                        jniDir = samplesDir + paths[i];
+                        break;
+                    }
+                }
+            }
+        }
+
         Group {
             name: "C++ sources"
-            prefix: Android.ndk.ndkDir + "/samples/Teapot/app/src/main/jni/"
+            prefix: teapotProbeJni.jniDir
             files: [
                 "TeapotNativeActivity.cpp",
                 "TeapotRenderer.cpp",
@@ -81,8 +97,23 @@ Project {
     }
 
     AndroidApk {
+        Probe {
+            id: teapotProbe
+            property string samplesDir: Android.sdk.ndkSamplesDir
+            property string dir
+            configure: {
+                var paths = ["/teapots/classic-teapot/src/main", "/Teapot/app/src/main"];
+                for (var i = 0; i < paths.length; ++i) {
+                    if (File.exists(samplesDir + paths[i])) {
+                        dir = samplesDir + paths[i];
+                        break;
+                    }
+                }
+            }
+        }
+
         name: "com.sample.teapot"
-        sourceSetDir: Android.sdk.ndkDir + "/samples/Teapot/app/src/main"
+        sourceSetDir: teapotProbe.dir
         Depends { productTypes: ["android.nativelibrary"] }
     }
 }