NativeCamera build with AndroidStub backported from OpenCV master.

diff --git a/platforms/scripts/camera_build.conf b/platforms/scripts/camera_build.conf
index 7392f91..fb79cac 100644 (file)
--- a/platforms/scripts/camera_build.conf
+++ b/platforms/scripts/camera_build.conf
@@ -1,27 +1,27 @@
 # make target;        arch; API level; Android Source Code Root
-native_camera_r2.2.0; armeabi;     8;  /home/alexander/Projects/AndroidSource/2.2.2
-native_camera_r2.2.0; armeabi-v7a; 8;  /home/alexander/Projects/AndroidSource/2.2.2
-native_camera_r2.3.3; armeabi;     9;  /home/alexander/Projects/AndroidSource/2.3.3
-native_camera_r2.3.3; armeabi-v7a; 9;  /home/alexander/Projects/AndroidSource/2.3.3
-native_camera_r2.3.3; x86;         9;  /home/alexander/Projects/AndroidSource/2.3.3
-native_camera_r3.0.1; armeabi;     9;  /home/alexander/Projects/AndroidSource/3.0.1
-native_camera_r3.0.1; armeabi-v7a; 9;  /home/alexander/Projects/AndroidSource/3.0.1
-native_camera_r3.0.1; x86;         9;  /home/alexander/Projects/AndroidSource/3.0.1
-native_camera_r4.0.3; armeabi;     14; /home/alexander/Projects/AndroidSource/4.0.3
-native_camera_r4.0.3; armeabi-v7a; 14; /home/alexander/Projects/AndroidSource/4.0.3
-native_camera_r4.0.3; x86;         14; /home/alexander/Projects/AndroidSource/4.0.3
-native_camera_r4.0.3; mips;        14; /home/alexander/Projects/AndroidSource/4.0.3_mips
-native_camera_r4.0.0; armeabi;     14; /home/alexander/Projects/AndroidSource/4.0.0
-native_camera_r4.0.0; armeabi-v7a; 14; /home/alexander/Projects/AndroidSource/4.0.0
-native_camera_r4.1.1; armeabi;     14; /home/alexander/Projects/AndroidSource/4.1.1
-native_camera_r4.1.1; armeabi-v7a; 14; /home/alexander/Projects/AndroidSource/4.1.1
-native_camera_r4.1.1; x86;         14; /home/alexander/Projects/AndroidSource/4.1.1
-native_camera_r4.1.1; mips;        14; /home/alexander/Projects/AndroidSource/4.1.1_mips
-native_camera_r4.2.0; armeabi-v7a; 14; /home/alexander/Projects/AndroidSource/4.2
-native_camera_r4.2.0; armeabi;     14; /home/alexander/Projects/AndroidSource/4.2
-native_camera_r4.2.0; x86;         14; /home/alexander/Projects/AndroidSource/4.2
-native_camera_r4.2.0; mips;        14; /home/alexander/Projects/AndroidSource/4.2
-native_camera_r4.3.0; armeabi;     14; /home/alexander/Projects/AndroidSource/4.3
-native_camera_r4.3.0; armeabi-v7a; 14; /home/alexander/Projects/AndroidSource/4.3
-native_camera_r4.3.0; x86;         14; /home/alexander/Projects/AndroidSource/4.3
-native_camera_r4.3.0; mips;        14; /home/alexander/Projects/AndroidSource/4.3
+native_camera_r2.2.0; armeabi;     8;  $ANDROID_STUB_ROOT/2.2.2
+native_camera_r2.2.0; armeabi-v7a; 8;  $ANDROID_STUB_ROOT/2.2.2
+native_camera_r2.3.3; armeabi;     9;  $ANDROID_STUB_ROOT/2.3.3
+native_camera_r2.3.3; armeabi-v7a; 9;  $ANDROID_STUB_ROOT/2.3.3
+native_camera_r2.3.3; x86;         9;  $ANDROID_STUB_ROOT/2.3.3
+native_camera_r3.0.1; armeabi;     9;  $ANDROID_STUB_ROOT/3.0.1
+native_camera_r3.0.1; armeabi-v7a; 9;  $ANDROID_STUB_ROOT/3.0.1
+native_camera_r3.0.1; x86;         9;  $ANDROID_STUB_ROOT/3.0.1
+native_camera_r4.0.3; armeabi;     14; $ANDROID_STUB_ROOT/4.0.3
+native_camera_r4.0.3; armeabi-v7a; 14; $ANDROID_STUB_ROOT/4.0.3
+native_camera_r4.0.3; x86;         14; $ANDROID_STUB_ROOT/4.0.3
+native_camera_r4.0.3; mips;        14; $ANDROID_STUB_ROOT/4.0.3_mips
+native_camera_r4.0.0; armeabi;     14; $ANDROID_STUB_ROOT/4.0.0
+native_camera_r4.0.0; armeabi-v7a; 14; $ANDROID_STUB_ROOT/4.0.0
+native_camera_r4.1.1; armeabi;     14; $ANDROID_STUB_ROOT/4.1.1
+native_camera_r4.1.1; armeabi-v7a; 14; $ANDROID_STUB_ROOT/4.1.1
+native_camera_r4.1.1; x86;         14; $ANDROID_STUB_ROOT/4.1.1
+native_camera_r4.1.1; mips;        14; $ANDROID_STUB_ROOT/4.1.1
+native_camera_r4.2.0; armeabi-v7a; 14; $ANDROID_STUB_ROOT/4.2.0
+native_camera_r4.2.0; armeabi;     14; $ANDROID_STUB_ROOT/4.2.0
+native_camera_r4.2.0; x86;         14; $ANDROID_STUB_ROOT/4.2.0
+native_camera_r4.2.0; mips;        14; $ANDROID_STUB_ROOT/4.2.0
+native_camera_r4.3.0; armeabi;     14; $ANDROID_STUB_ROOT/4.3.0
+native_camera_r4.3.0; armeabi-v7a; 14; $ANDROID_STUB_ROOT/4.3.0
+native_camera_r4.3.0; x86;         14; $ANDROID_STUB_ROOT/4.3.0
+native_camera_r4.3.0; mips;        14; $ANDROID_STUB_ROOT/4.3.0

diff --git a/platforms/scripts/cmake_android_all_cameras.py b/platforms/scripts/cmake_android_all_cameras.py
index c160df0..1ad69f4 100755 (executable)
--- a/platforms/scripts/cmake_android_all_cameras.py
+++ b/platforms/scripts/cmake_android_all_cameras.py
@@ -7,6 +7,12 @@ import shutil
 ScriptHome = os.path.split(sys.argv[0])[0]
 ConfFile = open(os.path.join(ScriptHome, "camera_build.conf"), "rt")
 HomeDir = os.getcwd()
+
+stub = os.environ.get("ANDROID_STUB_ROOT", "")
+
+if (stub == ""):
+    print("Warning: ANDROID_STUB_ROOT environment variable is not set or is empty")
+
 for s in ConfFile.readlines():
     s = s[0:s.find("#")]
     if (not s):
@@ -20,6 +26,7 @@ for s in ConfFile.readlines():
     NativeApiLevel = str.strip(keys[2])
     AndroidTreeRoot = str.strip(keys[3])
     AndroidTreeRoot = str.strip(AndroidTreeRoot, "\n")
+    AndroidTreeRoot = os.path.expandvars(AndroidTreeRoot)
     print("Building %s for %s" % (MakeTarget, Arch))
     BuildDir = os.path.join(HomeDir, MakeTarget + "_" + Arch)