From 7e8882a042b3ad446aa8d99131cc72c10e1976c5 Mon Sep 17 00:00:00 2001 From: guanghuafan Date: Wed, 19 Oct 2016 11:27:57 -0700 Subject: [PATCH] Cleaning up Android Build Scripts --- .gitignore | 11 +- .idea/compiler.xml | 22 -- .idea/copyright/profiles_settings.xml | 3 - .idea/encodings.xml | 6 - .idea/gradle.xml | 19 -- .idea/misc.xml | 87 ------- .idea/modules.xml | 10 - .idea/runConfigurations.xml | 12 - .idea/vcs.xml | 6 - app/.gitignore | 1 - app/CMakeLists.txt | 30 +-- app/build.gradle | 17 +- app/src/main/cpp/native-lib.cpp | 4 +- build.gradle | 2 +- gradlew | 0 .../opencv/engine/OpenCVEngineInterface.java | 215 ------------------ .../opencv/engine/OpenCVEngineInterface.java | 215 ------------------ .../debug/org/opencv/test/BuildConfig.java | 13 -- .../debug/org/opencv/BuildConfig.java | 13 -- .../release/org/opencv/BuildConfig.java | 13 -- .../r/androidTest/debug/org/opencv/R.java | 24 -- .../androidTest/debug/org/opencv/test/R.java | 99 -------- .../source/r/debug/org/opencv/R.java | 99 -------- .../source/r/release/org/opencv/R.java | 99 -------- 24 files changed, 21 insertions(+), 999 deletions(-) delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/copyright/profiles_settings.xml delete mode 100644 .idea/encodings.xml delete mode 100644 .idea/gradle.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/runConfigurations.xml delete mode 100644 .idea/vcs.xml delete mode 100644 app/.gitignore mode change 100644 => 100755 gradlew delete mode 100644 openCVLibrary310/build/generated/source/aidl/debug/org/opencv/engine/OpenCVEngineInterface.java delete mode 100644 openCVLibrary310/build/generated/source/aidl/release/org/opencv/engine/OpenCVEngineInterface.java delete mode 100644 openCVLibrary310/build/generated/source/buildConfig/androidTest/debug/org/opencv/test/BuildConfig.java delete mode 100644 openCVLibrary310/build/generated/source/buildConfig/debug/org/opencv/BuildConfig.java delete mode 100644 openCVLibrary310/build/generated/source/buildConfig/release/org/opencv/BuildConfig.java delete mode 100644 openCVLibrary310/build/generated/source/r/androidTest/debug/org/opencv/R.java delete mode 100644 openCVLibrary310/build/generated/source/r/androidTest/debug/org/opencv/test/R.java delete mode 100644 openCVLibrary310/build/generated/source/r/debug/org/opencv/R.java delete mode 100644 openCVLibrary310/build/generated/source/r/release/org/opencv/R.java diff --git a/.gitignore b/.gitignore index 39fb081..62114ad 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,8 @@ *.iml +.idea .gradle -/local.properties -/.idea/workspace.xml -/.idea/libraries -.DS_Store -/build -/captures +local.properties +build .externalNativeBuild +.DS_Store + diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 96cc43e..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf3..0000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index 97626ba..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index edd971a..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 65cf103..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - - - - - Android > Lint > Correctness - - - Java - - - Probable bugsJava - - - - - Android - - - - - - - - - - - - - - - - - - - - - - - - - Android API 24 Platform - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 030e4c8..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 7f68460..0000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore deleted file mode 100644 index 796b96d..0000000 --- a/app/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index cb3e285..3d36a4d 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -1,36 +1,22 @@ # Sets the minimum version of CMake required to build the native # library. You should either keep the default value or only pass a # value of 3.4.0 or lower. - -#Added 2 path definitions to support 20160825 additions -set(pathToProject C:/Users/Owner/AndroidStudioProjects/HelloCv) -set(pathToOpenCv C:/Users/Owner/OpenCV-3.1.0-android-sdk) - -#Added by the IDE on project create cmake_minimum_required(VERSION 3.4.1) -#Two sets suggested by Bruno Alexandre Krinski 20160825 -set(CMAKE_VERBOSE_MAKEFILE on) +# point to local openCV installation, relative to the directory of CMakeLists.txt +set(pathToOpenCv ${CMAKE_SOURCE_DIR}/../../OpenCV-3.1.0-android-sdk) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11") -#Addition suggested by Bruno Alexandre Krinski 20160825 include_directories(${pathToOpenCv}/sdk/native/jni/include) +add_library(native-lib SHARED + src/main/cpp/native-lib.cpp ) -#Added by IDE on project create -add_library( native-lib SHARED src/main/cpp/native-lib.cpp ) - -#Addition suggested by Bruno Alexandre Krinski 20160825 add_library( lib_opencv SHARED IMPORTED ) +set_target_properties(lib_opencv PROPERTIES IMPORTED_LOCATION + ${CMAKE_SOURCE_DIR}/src/main/jniLibs/${ANDROID_ABI}/libopencv_java3.so) -#Addition suggested by Bruno Alexandre Krinski 20160825 -set_target_properties(lib_opencv PROPERTIES IMPORTED_LOCATION ${pathToProject}/app/src/main/jniLibs/${ANDROID_ABI}/libopencv_java3.so) - -#Added by IDE on project create -find_library( log-lib log ) - -#Added by IDE on project create, Removed and replace with additional parameter suggested by Bruno Alexandre Krinski 20160825 -#target_link_libraries( native-lib $\{log-lib} ) -target_link_libraries( native-lib $\{log-lib} lib_opencv) +target_link_libraries(native-lib log lib_opencv) diff --git a/app/build.gradle b/app/build.gradle index 72d4836..4af20bf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,25 +10,18 @@ android { versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + ndk { + // this is default, you could list specific ones here + abiFilters 'x86', 'x86_64', 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'mips', 'mips64' + } externalNativeBuild { cmake { //DRS 20160825 - Commented 1, Added 1 - - Suggestion by Bruno Alexandre Krinski //cppFlags "-frtti -fexceptions" - cppFlags "-std=c++11 -frtti -fexceptions" - - //DRS 20160822h - Added 1. Later replaced by 20160825 - //abiFilters 'x86', 'x86_64', 'armeabi', 'armeabi-v7a', 'arm64-v8a' - //DRS 20160825 - Suggestion by Bruno Alexandre Krinski - abiFilters 'x86', 'x86_64', 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'mips', 'mips64' + cppFlags "-frtti -fexceptions" } } } - //DRS 20160822h - Added sourceSets - sourceSets { - main { - jniLibs.srcDirs = ['C:\\Users\\Owner\\AndroidStudioProjects\\HelloCv\\app\\src\\main\\jniLibs'] - } - } buildTypes { release { minifyEnabled false diff --git a/app/src/main/cpp/native-lib.cpp b/app/src/main/cpp/native-lib.cpp index 35ac029..3f1ec7d 100644 --- a/app/src/main/cpp/native-lib.cpp +++ b/app/src/main/cpp/native-lib.cpp @@ -3,7 +3,7 @@ #include extern "C" { - jstring + JNIEXPORT jstring JNICALL Java_com_company_cpp_hellocv_MainActivity_stringFromJNI( JNIEnv *env, jobject /* this */) { @@ -12,7 +12,7 @@ extern "C" { } //DRS 20160822c - Added native method - jstring + JNIEXPORT jstring JNICALL Java_com_company_cpp_hellocv_MainActivity_validate(JNIEnv *env, jobject, jlong addrGray, jlong addrRgba) { cv::Rect(); cv::Mat(); diff --git a/build.gradle b/build.gradle index c76cdbe..53f4fad 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0-beta1' + classpath 'com.android.tools.build:gradle:2.2.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/openCVLibrary310/build/generated/source/aidl/debug/org/opencv/engine/OpenCVEngineInterface.java b/openCVLibrary310/build/generated/source/aidl/debug/org/opencv/engine/OpenCVEngineInterface.java deleted file mode 100644 index 07e3739..0000000 --- a/openCVLibrary310/build/generated/source/aidl/debug/org/opencv/engine/OpenCVEngineInterface.java +++ /dev/null @@ -1,215 +0,0 @@ -/* - * This file is auto-generated. DO NOT MODIFY. - * Original file: C:\\Users\\Owner\\AndroidStudioProjects\\HelloCv\\openCVLibrary310\\src\\main\\aidl\\org\\opencv\\engine\\OpenCVEngineInterface.aidl - */ -package org.opencv.engine; -/** -* Class provides a Java interface for OpenCV Engine Service. It's synchronous with native OpenCVEngine class. -*/ -public interface OpenCVEngineInterface extends android.os.IInterface -{ -/** Local-side IPC implementation stub class. */ -public static abstract class Stub extends android.os.Binder implements org.opencv.engine.OpenCVEngineInterface -{ -private static final java.lang.String DESCRIPTOR = "org.opencv.engine.OpenCVEngineInterface"; -/** Construct the stub at attach it to the interface. */ -public Stub() -{ -this.attachInterface(this, DESCRIPTOR); -} -/** - * Cast an IBinder object into an org.opencv.engine.OpenCVEngineInterface interface, - * generating a proxy if needed. - */ -public static org.opencv.engine.OpenCVEngineInterface asInterface(android.os.IBinder obj) -{ -if ((obj==null)) { -return null; -} -android.os.IInterface iin = obj.queryLocalInterface(DESCRIPTOR); -if (((iin!=null)&&(iin instanceof org.opencv.engine.OpenCVEngineInterface))) { -return ((org.opencv.engine.OpenCVEngineInterface)iin); -} -return new org.opencv.engine.OpenCVEngineInterface.Stub.Proxy(obj); -} -@Override public android.os.IBinder asBinder() -{ -return this; -} -@Override public boolean onTransact(int code, android.os.Parcel data, android.os.Parcel reply, int flags) throws android.os.RemoteException -{ -switch (code) -{ -case INTERFACE_TRANSACTION: -{ -reply.writeString(DESCRIPTOR); -return true; -} -case TRANSACTION_getEngineVersion: -{ -data.enforceInterface(DESCRIPTOR); -int _result = this.getEngineVersion(); -reply.writeNoException(); -reply.writeInt(_result); -return true; -} -case TRANSACTION_getLibPathByVersion: -{ -data.enforceInterface(DESCRIPTOR); -java.lang.String _arg0; -_arg0 = data.readString(); -java.lang.String _result = this.getLibPathByVersion(_arg0); -reply.writeNoException(); -reply.writeString(_result); -return true; -} -case TRANSACTION_installVersion: -{ -data.enforceInterface(DESCRIPTOR); -java.lang.String _arg0; -_arg0 = data.readString(); -boolean _result = this.installVersion(_arg0); -reply.writeNoException(); -reply.writeInt(((_result)?(1):(0))); -return true; -} -case TRANSACTION_getLibraryList: -{ -data.enforceInterface(DESCRIPTOR); -java.lang.String _arg0; -_arg0 = data.readString(); -java.lang.String _result = this.getLibraryList(_arg0); -reply.writeNoException(); -reply.writeString(_result); -return true; -} -} -return super.onTransact(code, data, reply, flags); -} -private static class Proxy implements org.opencv.engine.OpenCVEngineInterface -{ -private android.os.IBinder mRemote; -Proxy(android.os.IBinder remote) -{ -mRemote = remote; -} -@Override public android.os.IBinder asBinder() -{ -return mRemote; -} -public java.lang.String getInterfaceDescriptor() -{ -return DESCRIPTOR; -} -@Override public int getEngineVersion() throws android.os.RemoteException -{ -android.os.Parcel _data = android.os.Parcel.obtain(); -android.os.Parcel _reply = android.os.Parcel.obtain(); -int _result; -try { -_data.writeInterfaceToken(DESCRIPTOR); -mRemote.transact(Stub.TRANSACTION_getEngineVersion, _data, _reply, 0); -_reply.readException(); -_result = _reply.readInt(); -} -finally { -_reply.recycle(); -_data.recycle(); -} -return _result; -} -/** - * Finds an installed OpenCV library. - * @param OpenCV version. - * @return Returns path to OpenCV native libs or an empty string if OpenCV can not be found. - */ -@Override public java.lang.String getLibPathByVersion(java.lang.String version) throws android.os.RemoteException -{ -android.os.Parcel _data = android.os.Parcel.obtain(); -android.os.Parcel _reply = android.os.Parcel.obtain(); -java.lang.String _result; -try { -_data.writeInterfaceToken(DESCRIPTOR); -_data.writeString(version); -mRemote.transact(Stub.TRANSACTION_getLibPathByVersion, _data, _reply, 0); -_reply.readException(); -_result = _reply.readString(); -} -finally { -_reply.recycle(); -_data.recycle(); -} -return _result; -} -/** - * Tries to install defined version of OpenCV from Google Play Market. - * @param OpenCV version. - * @return Returns true if installation was successful or OpenCV package has been already installed. - */ -@Override public boolean installVersion(java.lang.String version) throws android.os.RemoteException -{ -android.os.Parcel _data = android.os.Parcel.obtain(); -android.os.Parcel _reply = android.os.Parcel.obtain(); -boolean _result; -try { -_data.writeInterfaceToken(DESCRIPTOR); -_data.writeString(version); -mRemote.transact(Stub.TRANSACTION_installVersion, _data, _reply, 0); -_reply.readException(); -_result = (0!=_reply.readInt()); -} -finally { -_reply.recycle(); -_data.recycle(); -} -return _result; -} -/** - * Returns list of libraries in loading order, separated by semicolon. - * @param OpenCV version. - * @return Returns names of OpenCV libraries, separated by semicolon. - */ -@Override public java.lang.String getLibraryList(java.lang.String version) throws android.os.RemoteException -{ -android.os.Parcel _data = android.os.Parcel.obtain(); -android.os.Parcel _reply = android.os.Parcel.obtain(); -java.lang.String _result; -try { -_data.writeInterfaceToken(DESCRIPTOR); -_data.writeString(version); -mRemote.transact(Stub.TRANSACTION_getLibraryList, _data, _reply, 0); -_reply.readException(); -_result = _reply.readString(); -} -finally { -_reply.recycle(); -_data.recycle(); -} -return _result; -} -} -static final int TRANSACTION_getEngineVersion = (android.os.IBinder.FIRST_CALL_TRANSACTION + 0); -static final int TRANSACTION_getLibPathByVersion = (android.os.IBinder.FIRST_CALL_TRANSACTION + 1); -static final int TRANSACTION_installVersion = (android.os.IBinder.FIRST_CALL_TRANSACTION + 2); -static final int TRANSACTION_getLibraryList = (android.os.IBinder.FIRST_CALL_TRANSACTION + 3); -} -public int getEngineVersion() throws android.os.RemoteException; -/** - * Finds an installed OpenCV library. - * @param OpenCV version. - * @return Returns path to OpenCV native libs or an empty string if OpenCV can not be found. - */ -public java.lang.String getLibPathByVersion(java.lang.String version) throws android.os.RemoteException; -/** - * Tries to install defined version of OpenCV from Google Play Market. - * @param OpenCV version. - * @return Returns true if installation was successful or OpenCV package has been already installed. - */ -public boolean installVersion(java.lang.String version) throws android.os.RemoteException; -/** - * Returns list of libraries in loading order, separated by semicolon. - * @param OpenCV version. - * @return Returns names of OpenCV libraries, separated by semicolon. - */ -public java.lang.String getLibraryList(java.lang.String version) throws android.os.RemoteException; -} diff --git a/openCVLibrary310/build/generated/source/aidl/release/org/opencv/engine/OpenCVEngineInterface.java b/openCVLibrary310/build/generated/source/aidl/release/org/opencv/engine/OpenCVEngineInterface.java deleted file mode 100644 index 07e3739..0000000 --- a/openCVLibrary310/build/generated/source/aidl/release/org/opencv/engine/OpenCVEngineInterface.java +++ /dev/null @@ -1,215 +0,0 @@ -/* - * This file is auto-generated. DO NOT MODIFY. - * Original file: C:\\Users\\Owner\\AndroidStudioProjects\\HelloCv\\openCVLibrary310\\src\\main\\aidl\\org\\opencv\\engine\\OpenCVEngineInterface.aidl - */ -package org.opencv.engine; -/** -* Class provides a Java interface for OpenCV Engine Service. It's synchronous with native OpenCVEngine class. -*/ -public interface OpenCVEngineInterface extends android.os.IInterface -{ -/** Local-side IPC implementation stub class. */ -public static abstract class Stub extends android.os.Binder implements org.opencv.engine.OpenCVEngineInterface -{ -private static final java.lang.String DESCRIPTOR = "org.opencv.engine.OpenCVEngineInterface"; -/** Construct the stub at attach it to the interface. */ -public Stub() -{ -this.attachInterface(this, DESCRIPTOR); -} -/** - * Cast an IBinder object into an org.opencv.engine.OpenCVEngineInterface interface, - * generating a proxy if needed. - */ -public static org.opencv.engine.OpenCVEngineInterface asInterface(android.os.IBinder obj) -{ -if ((obj==null)) { -return null; -} -android.os.IInterface iin = obj.queryLocalInterface(DESCRIPTOR); -if (((iin!=null)&&(iin instanceof org.opencv.engine.OpenCVEngineInterface))) { -return ((org.opencv.engine.OpenCVEngineInterface)iin); -} -return new org.opencv.engine.OpenCVEngineInterface.Stub.Proxy(obj); -} -@Override public android.os.IBinder asBinder() -{ -return this; -} -@Override public boolean onTransact(int code, android.os.Parcel data, android.os.Parcel reply, int flags) throws android.os.RemoteException -{ -switch (code) -{ -case INTERFACE_TRANSACTION: -{ -reply.writeString(DESCRIPTOR); -return true; -} -case TRANSACTION_getEngineVersion: -{ -data.enforceInterface(DESCRIPTOR); -int _result = this.getEngineVersion(); -reply.writeNoException(); -reply.writeInt(_result); -return true; -} -case TRANSACTION_getLibPathByVersion: -{ -data.enforceInterface(DESCRIPTOR); -java.lang.String _arg0; -_arg0 = data.readString(); -java.lang.String _result = this.getLibPathByVersion(_arg0); -reply.writeNoException(); -reply.writeString(_result); -return true; -} -case TRANSACTION_installVersion: -{ -data.enforceInterface(DESCRIPTOR); -java.lang.String _arg0; -_arg0 = data.readString(); -boolean _result = this.installVersion(_arg0); -reply.writeNoException(); -reply.writeInt(((_result)?(1):(0))); -return true; -} -case TRANSACTION_getLibraryList: -{ -data.enforceInterface(DESCRIPTOR); -java.lang.String _arg0; -_arg0 = data.readString(); -java.lang.String _result = this.getLibraryList(_arg0); -reply.writeNoException(); -reply.writeString(_result); -return true; -} -} -return super.onTransact(code, data, reply, flags); -} -private static class Proxy implements org.opencv.engine.OpenCVEngineInterface -{ -private android.os.IBinder mRemote; -Proxy(android.os.IBinder remote) -{ -mRemote = remote; -} -@Override public android.os.IBinder asBinder() -{ -return mRemote; -} -public java.lang.String getInterfaceDescriptor() -{ -return DESCRIPTOR; -} -@Override public int getEngineVersion() throws android.os.RemoteException -{ -android.os.Parcel _data = android.os.Parcel.obtain(); -android.os.Parcel _reply = android.os.Parcel.obtain(); -int _result; -try { -_data.writeInterfaceToken(DESCRIPTOR); -mRemote.transact(Stub.TRANSACTION_getEngineVersion, _data, _reply, 0); -_reply.readException(); -_result = _reply.readInt(); -} -finally { -_reply.recycle(); -_data.recycle(); -} -return _result; -} -/** - * Finds an installed OpenCV library. - * @param OpenCV version. - * @return Returns path to OpenCV native libs or an empty string if OpenCV can not be found. - */ -@Override public java.lang.String getLibPathByVersion(java.lang.String version) throws android.os.RemoteException -{ -android.os.Parcel _data = android.os.Parcel.obtain(); -android.os.Parcel _reply = android.os.Parcel.obtain(); -java.lang.String _result; -try { -_data.writeInterfaceToken(DESCRIPTOR); -_data.writeString(version); -mRemote.transact(Stub.TRANSACTION_getLibPathByVersion, _data, _reply, 0); -_reply.readException(); -_result = _reply.readString(); -} -finally { -_reply.recycle(); -_data.recycle(); -} -return _result; -} -/** - * Tries to install defined version of OpenCV from Google Play Market. - * @param OpenCV version. - * @return Returns true if installation was successful or OpenCV package has been already installed. - */ -@Override public boolean installVersion(java.lang.String version) throws android.os.RemoteException -{ -android.os.Parcel _data = android.os.Parcel.obtain(); -android.os.Parcel _reply = android.os.Parcel.obtain(); -boolean _result; -try { -_data.writeInterfaceToken(DESCRIPTOR); -_data.writeString(version); -mRemote.transact(Stub.TRANSACTION_installVersion, _data, _reply, 0); -_reply.readException(); -_result = (0!=_reply.readInt()); -} -finally { -_reply.recycle(); -_data.recycle(); -} -return _result; -} -/** - * Returns list of libraries in loading order, separated by semicolon. - * @param OpenCV version. - * @return Returns names of OpenCV libraries, separated by semicolon. - */ -@Override public java.lang.String getLibraryList(java.lang.String version) throws android.os.RemoteException -{ -android.os.Parcel _data = android.os.Parcel.obtain(); -android.os.Parcel _reply = android.os.Parcel.obtain(); -java.lang.String _result; -try { -_data.writeInterfaceToken(DESCRIPTOR); -_data.writeString(version); -mRemote.transact(Stub.TRANSACTION_getLibraryList, _data, _reply, 0); -_reply.readException(); -_result = _reply.readString(); -} -finally { -_reply.recycle(); -_data.recycle(); -} -return _result; -} -} -static final int TRANSACTION_getEngineVersion = (android.os.IBinder.FIRST_CALL_TRANSACTION + 0); -static final int TRANSACTION_getLibPathByVersion = (android.os.IBinder.FIRST_CALL_TRANSACTION + 1); -static final int TRANSACTION_installVersion = (android.os.IBinder.FIRST_CALL_TRANSACTION + 2); -static final int TRANSACTION_getLibraryList = (android.os.IBinder.FIRST_CALL_TRANSACTION + 3); -} -public int getEngineVersion() throws android.os.RemoteException; -/** - * Finds an installed OpenCV library. - * @param OpenCV version. - * @return Returns path to OpenCV native libs or an empty string if OpenCV can not be found. - */ -public java.lang.String getLibPathByVersion(java.lang.String version) throws android.os.RemoteException; -/** - * Tries to install defined version of OpenCV from Google Play Market. - * @param OpenCV version. - * @return Returns true if installation was successful or OpenCV package has been already installed. - */ -public boolean installVersion(java.lang.String version) throws android.os.RemoteException; -/** - * Returns list of libraries in loading order, separated by semicolon. - * @param OpenCV version. - * @return Returns names of OpenCV libraries, separated by semicolon. - */ -public java.lang.String getLibraryList(java.lang.String version) throws android.os.RemoteException; -} diff --git a/openCVLibrary310/build/generated/source/buildConfig/androidTest/debug/org/opencv/test/BuildConfig.java b/openCVLibrary310/build/generated/source/buildConfig/androidTest/debug/org/opencv/test/BuildConfig.java deleted file mode 100644 index af821fa..0000000 --- a/openCVLibrary310/build/generated/source/buildConfig/androidTest/debug/org/opencv/test/BuildConfig.java +++ /dev/null @@ -1,13 +0,0 @@ -/** - * Automatically generated file. DO NOT MODIFY - */ -package org.opencv.test; - -public final class BuildConfig { - public static final boolean DEBUG = Boolean.parseBoolean("true"); - public static final String APPLICATION_ID = "org.opencv.test"; - public static final String BUILD_TYPE = "debug"; - public static final String FLAVOR = ""; - public static final int VERSION_CODE = -1; - public static final String VERSION_NAME = ""; -} diff --git a/openCVLibrary310/build/generated/source/buildConfig/debug/org/opencv/BuildConfig.java b/openCVLibrary310/build/generated/source/buildConfig/debug/org/opencv/BuildConfig.java deleted file mode 100644 index fde81ee..0000000 --- a/openCVLibrary310/build/generated/source/buildConfig/debug/org/opencv/BuildConfig.java +++ /dev/null @@ -1,13 +0,0 @@ -/** - * Automatically generated file. DO NOT MODIFY - */ -package org.opencv; - -public final class BuildConfig { - public static final boolean DEBUG = Boolean.parseBoolean("true"); - public static final String APPLICATION_ID = "org.opencv"; - public static final String BUILD_TYPE = "debug"; - public static final String FLAVOR = ""; - public static final int VERSION_CODE = 3100; - public static final String VERSION_NAME = "3.1.0"; -} diff --git a/openCVLibrary310/build/generated/source/buildConfig/release/org/opencv/BuildConfig.java b/openCVLibrary310/build/generated/source/buildConfig/release/org/opencv/BuildConfig.java deleted file mode 100644 index 1d5168b..0000000 --- a/openCVLibrary310/build/generated/source/buildConfig/release/org/opencv/BuildConfig.java +++ /dev/null @@ -1,13 +0,0 @@ -/** - * Automatically generated file. DO NOT MODIFY - */ -package org.opencv; - -public final class BuildConfig { - public static final boolean DEBUG = false; - public static final String APPLICATION_ID = "org.opencv"; - public static final String BUILD_TYPE = "release"; - public static final String FLAVOR = ""; - public static final int VERSION_CODE = 3100; - public static final String VERSION_NAME = "3.1.0"; -} diff --git a/openCVLibrary310/build/generated/source/r/androidTest/debug/org/opencv/R.java b/openCVLibrary310/build/generated/source/r/androidTest/debug/org/opencv/R.java deleted file mode 100644 index 9812649..0000000 --- a/openCVLibrary310/build/generated/source/r/androidTest/debug/org/opencv/R.java +++ /dev/null @@ -1,24 +0,0 @@ -/* AUTO-GENERATED FILE. DO NOT MODIFY. - * - * This class was automatically generated by the - * aapt tool from the resource data it found. It - * should not be modified by hand. - */ -package org.opencv; - -public final class R { - public static final class attr { - public static final int camera_id = 0x7f010001; - public static final int show_fps = 0x7f010000; - } - public static final class id { - public static final int any = 0x7f020000; - public static final int back = 0x7f020001; - public static final int front = 0x7f020002; - } - public static final class styleable { - public static final int[] CameraBridgeViewBase = { 0x7f010000, 0x7f010001 }; - public static final int CameraBridgeViewBase_camera_id = 1; - public static final int CameraBridgeViewBase_show_fps = 0; - } -} diff --git a/openCVLibrary310/build/generated/source/r/androidTest/debug/org/opencv/test/R.java b/openCVLibrary310/build/generated/source/r/androidTest/debug/org/opencv/test/R.java deleted file mode 100644 index e785f5e..0000000 --- a/openCVLibrary310/build/generated/source/r/androidTest/debug/org/opencv/test/R.java +++ /dev/null @@ -1,99 +0,0 @@ -/* AUTO-GENERATED FILE. DO NOT MODIFY. - * - * This class was automatically generated by the - * aapt tool from the resource data it found. It - * should not be modified by hand. - */ - -package org.opencv.test; - -public final class R { - public static final class attr { - /**

May be an integer value, such as "100". -

This may also be a reference to a resource (in the form -"@[package:]type:name") or -theme attribute (in the form -"?[package:][type:]name") -containing a value of this type. -

May be one of the following constant values.

- ---- - - - -
ConstantValueDescription
any-1
back99
front98
- */ - public static final int camera_id=0x7f010001; - /**

Must be a boolean value, either "true" or "false". -

This may also be a reference to a resource (in the form -"@[package:]type:name") or -theme attribute (in the form -"?[package:][type:]name") -containing a value of this type. - */ - public static final int show_fps=0x7f010000; - } - public static final class id { - public static final int any=0x7f020000; - public static final int back=0x7f020001; - public static final int front=0x7f020002; - } - public static final class styleable { - /** Attributes that can be used with a CameraBridgeViewBase. -

Includes the following attributes:

- - - - - - -
AttributeDescription
{@link #CameraBridgeViewBase_camera_id org.opencv.test:camera_id}
{@link #CameraBridgeViewBase_show_fps org.opencv.test:show_fps}
- @see #CameraBridgeViewBase_camera_id - @see #CameraBridgeViewBase_show_fps - */ - public static final int[] CameraBridgeViewBase = { - 0x7f010000, 0x7f010001 - }; - /** -

This symbol is the offset where the {@link org.opencv.test.R.attr#camera_id} - attribute's value can be found in the {@link #CameraBridgeViewBase} array. - - -

May be an integer value, such as "100". -

This may also be a reference to a resource (in the form -"@[package:]type:name") or -theme attribute (in the form -"?[package:][type:]name") -containing a value of this type. -

May be one of the following constant values.

- ---- - - - -
ConstantValueDescription
any-1
back99
front98
- @attr name org.opencv.test:camera_id - */ - public static final int CameraBridgeViewBase_camera_id = 1; - /** -

This symbol is the offset where the {@link org.opencv.test.R.attr#show_fps} - attribute's value can be found in the {@link #CameraBridgeViewBase} array. - - -

Must be a boolean value, either "true" or "false". -

This may also be a reference to a resource (in the form -"@[package:]type:name") or -theme attribute (in the form -"?[package:][type:]name") -containing a value of this type. - @attr name org.opencv.test:show_fps - */ - public static final int CameraBridgeViewBase_show_fps = 0; - }; -} diff --git a/openCVLibrary310/build/generated/source/r/debug/org/opencv/R.java b/openCVLibrary310/build/generated/source/r/debug/org/opencv/R.java deleted file mode 100644 index e7f4f9f..0000000 --- a/openCVLibrary310/build/generated/source/r/debug/org/opencv/R.java +++ /dev/null @@ -1,99 +0,0 @@ -/* AUTO-GENERATED FILE. DO NOT MODIFY. - * - * This class was automatically generated by the - * aapt tool from the resource data it found. It - * should not be modified by hand. - */ - -package org.opencv; - -public final class R { - public static final class attr { - /**

May be an integer value, such as "100". -

This may also be a reference to a resource (in the form -"@[package:]type:name") or -theme attribute (in the form -"?[package:][type:]name") -containing a value of this type. -

May be one of the following constant values.

- ---- - - - -
ConstantValueDescription
any-1
back99
front98
- */ - public static int camera_id=0x7f010001; - /**

Must be a boolean value, either "true" or "false". -

This may also be a reference to a resource (in the form -"@[package:]type:name") or -theme attribute (in the form -"?[package:][type:]name") -containing a value of this type. - */ - public static int show_fps=0x7f010000; - } - public static final class id { - public static int any=0x7f020000; - public static int back=0x7f020001; - public static int front=0x7f020002; - } - public static final class styleable { - /** Attributes that can be used with a CameraBridgeViewBase. -

Includes the following attributes:

- - - - - - -
AttributeDescription
{@link #CameraBridgeViewBase_camera_id org.opencv:camera_id}
{@link #CameraBridgeViewBase_show_fps org.opencv:show_fps}
- @see #CameraBridgeViewBase_camera_id - @see #CameraBridgeViewBase_show_fps - */ - public static final int[] CameraBridgeViewBase = { - 0x7f010000, 0x7f010001 - }; - /** -

This symbol is the offset where the {@link org.opencv.R.attr#camera_id} - attribute's value can be found in the {@link #CameraBridgeViewBase} array. - - -

May be an integer value, such as "100". -

This may also be a reference to a resource (in the form -"@[package:]type:name") or -theme attribute (in the form -"?[package:][type:]name") -containing a value of this type. -

May be one of the following constant values.

- ---- - - - -
ConstantValueDescription
any-1
back99
front98
- @attr name org.opencv:camera_id - */ - public static int CameraBridgeViewBase_camera_id = 1; - /** -

This symbol is the offset where the {@link org.opencv.R.attr#show_fps} - attribute's value can be found in the {@link #CameraBridgeViewBase} array. - - -

Must be a boolean value, either "true" or "false". -

This may also be a reference to a resource (in the form -"@[package:]type:name") or -theme attribute (in the form -"?[package:][type:]name") -containing a value of this type. - @attr name org.opencv:show_fps - */ - public static int CameraBridgeViewBase_show_fps = 0; - }; -} diff --git a/openCVLibrary310/build/generated/source/r/release/org/opencv/R.java b/openCVLibrary310/build/generated/source/r/release/org/opencv/R.java deleted file mode 100644 index e7f4f9f..0000000 --- a/openCVLibrary310/build/generated/source/r/release/org/opencv/R.java +++ /dev/null @@ -1,99 +0,0 @@ -/* AUTO-GENERATED FILE. DO NOT MODIFY. - * - * This class was automatically generated by the - * aapt tool from the resource data it found. It - * should not be modified by hand. - */ - -package org.opencv; - -public final class R { - public static final class attr { - /**

May be an integer value, such as "100". -

This may also be a reference to a resource (in the form -"@[package:]type:name") or -theme attribute (in the form -"?[package:][type:]name") -containing a value of this type. -

May be one of the following constant values.

- ---- - - - -
ConstantValueDescription
any-1
back99
front98
- */ - public static int camera_id=0x7f010001; - /**

Must be a boolean value, either "true" or "false". -

This may also be a reference to a resource (in the form -"@[package:]type:name") or -theme attribute (in the form -"?[package:][type:]name") -containing a value of this type. - */ - public static int show_fps=0x7f010000; - } - public static final class id { - public static int any=0x7f020000; - public static int back=0x7f020001; - public static int front=0x7f020002; - } - public static final class styleable { - /** Attributes that can be used with a CameraBridgeViewBase. -

Includes the following attributes:

- - - - - - -
AttributeDescription
{@link #CameraBridgeViewBase_camera_id org.opencv:camera_id}
{@link #CameraBridgeViewBase_show_fps org.opencv:show_fps}
- @see #CameraBridgeViewBase_camera_id - @see #CameraBridgeViewBase_show_fps - */ - public static final int[] CameraBridgeViewBase = { - 0x7f010000, 0x7f010001 - }; - /** -

This symbol is the offset where the {@link org.opencv.R.attr#camera_id} - attribute's value can be found in the {@link #CameraBridgeViewBase} array. - - -

May be an integer value, such as "100". -

This may also be a reference to a resource (in the form -"@[package:]type:name") or -theme attribute (in the form -"?[package:][type:]name") -containing a value of this type. -

May be one of the following constant values.

- ---- - - - -
ConstantValueDescription
any-1
back99
front98
- @attr name org.opencv:camera_id - */ - public static int CameraBridgeViewBase_camera_id = 1; - /** -

This symbol is the offset where the {@link org.opencv.R.attr#show_fps} - attribute's value can be found in the {@link #CameraBridgeViewBase} array. - - -

Must be a boolean value, either "true" or "false". -

This may also be a reference to a resource (in the form -"@[package:]type:name") or -theme attribute (in the form -"?[package:][type:]name") -containing a value of this type. - @attr name org.opencv:show_fps - */ - public static int CameraBridgeViewBase_show_fps = 0; - }; -}