Skip to content

O
opencv
Commit ec8b79cc authored by Alexander Smorkalov's avatar Alexander Smorkalov
Browse files
Options

Small camera build script improvements.

parent c09e2f88
Show whitespace changes
Inline Side-by-side
Showing with 28 additions and 25 deletions
android/scripts/camera_build.conf
View file @ ec8b79cc
native_camera_r2.2.0;armeabi;8;/home/alexander/Projects/AndroidSource/2.2.2 # make target; arch; API level; Android Source Code Root
native_camera_r2.2.0;armeabi-v7a;8;/home/alexander/Projects/AndroidSource/2.2.2 native_camera_r2.2.0; armeabi; 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.2.0; armeabi-v7a; 8; /home/alexander/Projects/AndroidSource/2.2.2
native_camera_r2.3.3;armeabi-v7a;9;/home/alexander/Projects/AndroidSource/2.3.3 native_camera_r2.3.3; armeabi; 9; /home/alexander/Projects/AndroidSource/2.3.3
native_camera_r2.3.3;x86;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_r3.0.1;armeabi;9;/home/alexander/Projects/AndroidSource/3.0.1 native_camera_r2.3.3; x86; 9; /home/alexander/Projects/AndroidSource/2.3.3
native_camera_r3.0.1;armeabi-v7a;9;/home/alexander/Projects/AndroidSource/3.0.1 native_camera_r3.0.1; armeabi; 9; /home/alexander/Projects/AndroidSource/3.0.1
native_camera_r3.0.1;x86;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_r4.0.3;armeabi;14;/home/alexander/Projects/AndroidSource/4.0.3 native_camera_r3.0.1; x86; 9; /home/alexander/Projects/AndroidSource/3.0.1
native_camera_r4.0.3;armeabi-v7a;14;/home/alexander/Projects/AndroidSource/4.0.3 native_camera_r4.0.3; armeabi; 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; armeabi-v7a; 14; /home/alexander/Projects/AndroidSource/4.0.3
native_camera_r4.0.0;armeabi;14;/home/alexander/Projects/AndroidSource/4.0.0 native_camera_r4.0.3; x86; 14; /home/alexander/Projects/AndroidSource/4.0.3
native_camera_r4.0.0;armeabi-v7a;14;/home/alexander/Projects/AndroidSource/4.0.0 native_camera_r4.0.0; armeabi; 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.0.0; armeabi-v7a; 14; /home/alexander/Projects/AndroidSource/4.0.0
native_camera_r4.1.1;armeabi-v7a;14;/home/alexander/Projects/AndroidSource/4.1.1 native_camera_r4.1.1; armeabi; 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; armeabi-v7a; 14; /home/alexander/Projects/AndroidSource/4.1.1
\ No newline at end of file native_camera_r4.1.1; x86; 14; /home/alexander/Projects/AndroidSource/4.1.1
android/scripts/cmake_android_all_cameras.py
View file @ ec8b79cc
...@@ -8,14 +8,17 @@ ScriptHome = os.path.split(sys.argv[0])[0] ...@@ -8,14 +8,17 @@ ScriptHome = os.path.split(sys.argv[0])[0]
ConfFile = open(os.path.join(ScriptHome, "camera_build.conf"), "rt") ConfFile = open(os.path.join(ScriptHome, "camera_build.conf"), "rt")
HomeDir = os.getcwd() HomeDir = os.getcwd()
for s in ConfFile.readlines(): for s in ConfFile.readlines():
s = s[0:s.find("#")]
if (not s):
continue
keys = s.split(";") keys = s.split(";")
if (len(keys) < 4): if (len(keys) < 4):
print("Error: invalid config line: \"%s\"" % s) print("Error: invalid config line: \"%s\"" % s)
continue continue
MakeTarget = keys[0] MakeTarget = str.strip(keys[0])
Arch = keys[1] Arch = str.strip(keys[1])
NativeApiLevel = keys[2] NativeApiLevel = str.strip(keys[2])
AndroidTreeRoot = keys[3] AndroidTreeRoot = str.strip(keys[3])
AndroidTreeRoot = str.strip(AndroidTreeRoot, "\n") AndroidTreeRoot = str.strip(AndroidTreeRoot, "\n")
print("Building %s for %s" % (MakeTarget, Arch)) print("Building %s for %s" % (MakeTarget, Arch))
BuildDir = os.path.join(HomeDir, MakeTarget + "_" + Arch) BuildDir = os.path.join(HomeDir, MakeTarget + "_" + Arch)
...@@ -35,10 +38,10 @@ for s in ConfFile.readlines(): ...@@ -35,10 +38,10 @@ for s in ConfFile.readlines():
BuildLog = os.path.join(BuildDir, "build.log") 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) 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); MakeCmdLine = "make %s >> \"%s\" 2>&1" % (MakeTarget, BuildLog);
#print(CmakeCmdLine) print(CmakeCmdLine)
os.system(CmakeCmdLine) #os.system(CmakeCmdLine)
#print(MakeCmdLine) print(MakeCmdLine)
os.system(MakeCmdLine) #os.system(MakeCmdLine)
os.chdir(HomeDir) os.chdir(HomeDir)
CameraLib = os.path.join(BuildDir, "lib", Arch, "lib" + MakeTarget + ".so") CameraLib = os.path.join(BuildDir, "lib", Arch, "lib" + MakeTarget + ".so")
if (os.path.exists(CameraLib)): if (os.path.exists(CameraLib)):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment