Native camera fix for Nexus 7 with Android JB. Camera build script updated.

android/scripts/cmake_android_all_cameras.py

@@ -38,10 +38,10 @@ for s in ConfFile.readlines():
     BuildLog = os.path.join(BuildDir, "build.log")
     CmakeCmdLine = "cmake -DCMAKE_TOOLCHAIN_FILE=../android.toolchain.cmake -DANDROID_SOURCE_TREE=\"%s\" -DANDROID_NATIVE_API_LEVEL=\"%s\" -DANDROID_ABI=\"%s\" -DANDROID_USE_STLPORT=ON ../../ > \"%s\" 2>&1" % (AndroidTreeRoot, NativeApiLevel, Arch, BuildLog)
     MakeCmdLine = "make %s >> \"%s\" 2>&1" % (MakeTarget, BuildLog);
-    print(CmakeCmdLine)
-    #os.system(CmakeCmdLine)
-    print(MakeCmdLine)
-    #os.system(MakeCmdLine)
+    #print(CmakeCmdLine)
+    os.system(CmakeCmdLine)
+    #print(MakeCmdLine)
+    os.system(MakeCmdLine)
     os.chdir(HomeDir)
     CameraLib = os.path.join(BuildDir, "lib", Arch, "lib" + MakeTarget + ".so")
     if (os.path.exists(CameraLib)):

modules/androidcamera/camera_wrapper/camera_wrapper.cpp

@@ -828,7 +828,7 @@ void CameraHandler::applyProperties(CameraHandler** ppcameraHandler)
 
     LOGD("CameraHandler::applyProperties()");
 
-#if !defined(ANDROID_r2_2_0)
+#if defined(ANDROID_r4_0_3)
     LOGD("Reconnect camera");
     (*ppcameraHandler)->camera->reconnect();
     (*ppcameraHandler)->params = (*ppcameraHandler)->camera->getParameters();