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

Android samples are included into the Android package

Browse Source
This commit is contained in:
Andrey Kamaev 2011-07-14 09:34:57 +00:00
parent a70f354c0f
commit 20ec29f22e
4 changed files with 47 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
android/scripts/package.sh
View File

@ -10,6 +10,7 @@ cd package
PRG_DIR=`pwd` PRG_DIR=`pwd`
mkdir opencv mkdir opencv
# neon-enabled build # neon-enabled build
cd $PRG_DIR cd $PRG_DIR
mkdir build-neon mkdir build-neon
@ -23,6 +24,7 @@ rm -rf doc include src .classpath .project AndroidManifest.xml default.propertie
mv libs/armeabi-v7a libs/armeabi-v7a-neon mv libs/armeabi-v7a libs/armeabi-v7a-neon
mv share/OpenCV/3rdparty/libs/armeabi-v7a share/OpenCV/3rdparty/libs/armeabi-v7a-neon mv share/OpenCV/3rdparty/libs/armeabi-v7a share/OpenCV/3rdparty/libs/armeabi-v7a-neon
# armeabi-v7a build # armeabi-v7a build
cd "$PRG_DIR" cd "$PRG_DIR"
mkdir build mkdir build
@ -51,7 +53,42 @@ cp "$ANDROID_DIR/../README" opencv/
CV_VERSION=`grep -o "[0-9]\+\.[0-9]\+\.[0-9]\+" opencv/share/OpenCV/OpenCVConfig-version.cmake` CV_VERSION=`grep -o "[0-9]\+\.[0-9]\+\.[0-9]\+" opencv/share/OpenCV/OpenCVConfig-version.cmake`
mv opencv opencv$CV_VERSION mv opencv opencv$CV_VERSION
tar cjpf opencv$CV_VERSION.tar.bz2 opencv$CV_VERSION || exit -1
#samples
cp -r "$ANDROID_DIR/../samples/android" "$PRG_DIR/samples"
cd "$PRG_DIR/samples"
#enable for loops over items with spaces in their name
IFS="
"
for dir in `ls -1 | grep -v hello-android`
do
if [ -f "$dir/default.properties" ]
then
HAS_REFERENCE=`cat "$dir/default.properties" | grep -c android.library.reference.1`
if [ $HAS_REFERENCE = 1 ]
then
echo -n > "$dir/default.properties"
android update project --name "$dir" --target "android-8" --library "../../opencv$CV_VERSION" --path "$dir"
echo 'android update project --name "$dir" --target "android-8" --library "../opencv$CV_VERSION" --path "$dir"'
fi
fi
done
echo "OPENCV_MK_PATH:=../../opencv$CV_VERSION/share/OpenCV/OpenCV.mk" > includeOpenCV.mk
cd "$PRG_DIR/samples"
#remove ignored files/folders
svn status --no-ignore | grep ^I | cut -c9- | xargs -d \\n rm -rf
#remove unversioned files/folders
svn status | grep ^\? | cut -c9- | xargs -d \\n rm -rf
#remove unneded CMakeLists.txt
rm CMakeLists.txt
# pack all files
cd $PRG_DIR
tar cjpf opencv$CV_VERSION.tar.bz2 --exclude-vcs opencv$CV_VERSION samples || exit -1
echo echo
echo "Package opencv$CV_VERSION.tar.bz2 is successfully created" echo "Package opencv$CV_VERSION.tar.bz2 is successfully created"

7
samples/android/2-native/jni/Android.mk
View File

@ -2,11 +2,12 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
OPENCV_MK_BUILD_PATH:=../../../../android/build/OpenCV.mk include ../includeOpenCV.mk
ifeq ("$(wildcard $(OPENCV_MK_BUILD_PATH))","") ifeq ("$(wildcard $(OPENCV_MK_PATH))","")
#try to load OpenCV.mk from default install location
include $(TOOLCHAIN_PREBUILT_ROOT)/user/share/OpenCV/OpenCV.mk include $(TOOLCHAIN_PREBUILT_ROOT)/user/share/OpenCV/OpenCV.mk
else else
include $(OPENCV_MK_BUILD_PATH) include $(OPENCV_MK_PATH)
endif endif
LOCAL_MODULE := native_sample LOCAL_MODULE := native_sample

7
samples/android/4-mixed/jni/Android.mk
View File

@ -3,11 +3,12 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
OPENCV_CAMERA_MODULES:=off OPENCV_CAMERA_MODULES:=off
OPENCV_MK_BUILD_PATH:=../../../../android/build/OpenCV.mk include ../includeOpenCV.mk
ifeq ("$(wildcard $(OPENCV_MK_BUILD_PATH))","") ifeq ("$(wildcard $(OPENCV_MK_PATH))","")
#try to load OpenCV.mk from default install location
include $(TOOLCHAIN_PREBUILT_ROOT)/user/share/OpenCV/OpenCV.mk include $(TOOLCHAIN_PREBUILT_ROOT)/user/share/OpenCV/OpenCV.mk
else else
include $(OPENCV_MK_BUILD_PATH) include $(OPENCV_MK_PATH)
endif endif
LOCAL_MODULE := mixed_sample LOCAL_MODULE := mixed_sample

1
samples/android/includeOpenCV.mk Normal file
View File

@ -0,0 +1 @@
OPENCV_MK_PATH:=../../../android/build/OpenCV.mk