Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
759863d9
Commit
759863d9
authored
Nov 16, 2012
by
Alexander Smorkalov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #2537 OpenCV Manager doesn't work on Android 4.2 fixed.
parent
72a63922
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
8 deletions
+9
-8
cmake_android_service.sh
android/scripts/cmake_android_service.sh
+1
-1
AndroidManifest.xml
android/service/engine/AndroidManifest.xml
+2
-2
Android.mk
android/service/engine/jni/Android.mk
+3
-4
Application.mk
android/service/engine/jni/Application.mk
+2
-0
Tests.mk
android/service/engine/jni/Tests/Tests.mk
+1
-1
No files found.
android/scripts/cmake_android_service.sh
View file @
759863d9
...
...
@@ -4,5 +4,5 @@ cd `dirname $0`/..
mkdir
-p
build_service
cd
build_service
cmake
-DCMAKE_TOOLCHAIN_FILE
=
../android.toolchain.cmake
-DANDROID_
STL
=
stlport_static
-DANDROID_STL_FORCE_FEATURES
=
OFF
-DBUILD_ANDROID_SERVICE
=
ON
-DANDROID_SOURCE_TREE
=
~/Projects/AndroidSource/ServiceStub/
$@
../..
cmake
-DCMAKE_TOOLCHAIN_FILE
=
../android.toolchain.cmake
-DANDROID_
TOOLCHAIN_NAME
=
"arm-linux-androideabi-4.4.3"
-DANDROID_STL
=
stlport_static
-DANDROID_STL_FORCE_FEATURES
=
OFF
-DBUILD_ANDROID_SERVICE
=
ON
-DANDROID_SOURCE_TREE
=
~/Projects/AndroidSource/ServiceStub/
$@
../..
android/service/engine/AndroidManifest.xml
View file @
759863d9
<?xml version="1.0" encoding="utf-8"?>
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
package=
"org.opencv.engine"
android:versionCode=
"2
0
"
android:versionName=
"2.
0
"
>
android:versionCode=
"2
1
"
android:versionName=
"2.
1
"
>
<uses-sdk
android:minSdkVersion=
"8"
/>
<uses-feature
android:name=
"android.hardware.touchscreen"
android:required=
"false"
/>
...
...
android/service/engine/jni/Android.mk
View file @
759863d9
...
...
@@ -35,7 +35,7 @@ LOCAL_MODULE := libOpenCVEngine
LOCAL_LDLIBS += -lz -lbinder -llog -lutils
LOCAL_LDFLAGS += -Wl,-allow-shlib-undefine
LOCAL_LDFLAGS += -Wl,-allow-shlib-undefine
d
include $(BUILD_SHARED_LIBRARY)
...
...
@@ -74,7 +74,6 @@ LOCAL_CFLAGS += -D__SUPPORT_MIPS
LOCAL_MODULE := libOpenCVEngine_jni
LOCAL_LDLIBS += -lz -lbinder -llog -lutils -landroid_runtime
LOCAL_SHARED_LIBRARIES = libOpenCVEngine
include $(BUILD_SHARED_LIBRARY)
...
...
@@ -83,4 +82,4 @@ include $(BUILD_SHARED_LIBRARY)
# Native test application
#---------------------------------------------------------------------
include $(LOCAL_PATH)/Tests/Tests.mk
\ No newline at end of file
#include $(LOCAL_PATH)/Tests/Tests.mk
\ No newline at end of file
android/service/engine/jni/Application.mk
View file @
759863d9
...
...
@@ -2,4 +2,5 @@ APP_ABI := armeabi x86 mips
APP_PLATFORM := android-8
APP_STL := stlport_static
APP_CPPFLAGS := -fno-rtti -fno-exceptions
NDK_TOOLCHAIN_VERSION=4.4.3
#APP_OPTIM := debug
\ No newline at end of file
android/service/engine/jni/Tests/Tests.mk
View file @
759863d9
...
...
@@ -36,7 +36,7 @@ LOCAL_CFLAGS += -D__SUPPORT_TEGRA3
LOCAL_CFLAGS += -D__SUPPORT_MIPS
#LOCAL_CFLAGS += -D__SUPPORT_ARMEABI_FEATURES
LOCAL_LDFLAGS = -Wl,-allow-shlib-undefined
#
LOCAL_LDFLAGS = -Wl,-allow-shlib-undefined
LOCAL_MODULE := OpenCVEngineTestApp
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment