CMakeLists.txt rescued. Androidmanifest unified.
This commit is contained in:
parent
a5ee07d340
commit
84856fa2c1
samples/android/15-puzzle
@ -3,10 +3,6 @@
|
|||||||
android:versionCode="1"
|
android:versionCode="1"
|
||||||
android:versionName="1.0" >
|
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"/>
|
<uses-sdk android:minSdkVersion="8"/>
|
||||||
|
|
||||||
<application
|
<application
|
||||||
@ -16,7 +12,9 @@
|
|||||||
<activity
|
<activity
|
||||||
android:name=".Puzzle15Activity"
|
android:name=".Puzzle15Activity"
|
||||||
android:label="@string/app_name"
|
android:label="@string/app_name"
|
||||||
android:configChanges = "keyboardHidden|orientation" >
|
android:screenOrientation="landscape"
|
||||||
|
android:configChanges="keyboardHidden|orientation" >
|
||||||
|
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.intent.action.MAIN" />
|
<action android:name="android.intent.action.MAIN" />
|
||||||
|
|
||||||
@ -25,4 +23,9 @@
|
|||||||
</activity>
|
</activity>
|
||||||
</application>
|
</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>
|
</manifest>
|
6
samples/android/15-puzzle/CMakeLists.txt
Normal file
6
samples/android/15-puzzle/CMakeLists.txt
Normal 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()
|
Loading…
x
Reference in New Issue
Block a user