generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

CMakeLists.txt rescued. Androidmanifest unified.

Browse Source
This commit is contained in:
Alexander Smorkalov 2012-10-22 17:15:51 +04:00 committed by Andrey Kamaev
parent a5ee07d340
commit 84856fa2c1
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
samples/android/15-puzzle/AndroidManifest.xml
View File

@ -3,10 +3,6 @@
android:versionCode="1"
android:versionName="1.0" >
<uses-permission android:name="android.permission.CAMERA" required="false"/>
<uses-feature android:name="android.hardware.camera" required="false"/>
<uses-feature android:name="android.hardware.camera.autofocus" required="false"/>
<uses-sdk android:minSdkVersion="8"/>
<application
@ -16,7 +12,9 @@
<activity
android:name=".Puzzle15Activity"
android:label="@string/app_name"
android:configChanges = "keyboardHidden|orientation" >
android:screenOrientation="landscape"
android:configChanges="keyboardHidden|orientation" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@ -25,4 +23,9 @@
</activity>
</application>
<uses-feature android:name="android.hardware.camera" android:required="false"/>
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
<uses-feature android:name="android.hardware.camera.front.autofocus" android:required="false"/>
</manifest>

6
samples/android/15-puzzle/CMakeLists.txt Normal file
View File

@ -0,0 +1,6 @@
set(sample example-15-puzzle)
add_android_project(${sample} "${CMAKE_CURRENT_SOURCE_DIR}" LIBRARY_DEPS ${OpenCV_BINARY_DIR} SDK_TARGET 11 ${ANDROID_SDK_TARGET})
if(TARGET ${sample})
add_dependencies(opencv_android_examples ${sample})
endif()