-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
17 changed files
with
39 additions
and
36 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
### APK file is available at [this](./app/build/outputs/apk/debug/) location. |
1 change: 1 addition & 0 deletions
1
android App/openCV- sdk/build/.transforms/10d0b33ea201c49c144f6f9d17da4c3e.bin
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
o/classes |
Binary file added
BIN
+567 KB
...id App/openCV- sdk/build/.transforms/10d0b33ea201c49c144f6f9d17da4c3e/classes/classes.dex
Binary file not shown.
1 change: 1 addition & 0 deletions
1
android App/openCV- sdk/build/.transforms/f1851b9386a6583da4ead2bc60559da7.bin
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
o/classes |
Binary file added
BIN
+567 KB
...id App/openCV- sdk/build/.transforms/f1851b9386a6583da4ead2bc60559da7/classes/classes.dex
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
android App/openCV- sdk/build/intermediates/cmake/debug/obj/arm64-v8a/libopencv_jni_shared.a
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
...id App/openCV- sdk/build/intermediates/cmake/debug/obj/armeabi-v7a/libopencv_jni_shared.a
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
android App/openCV- sdk/build/intermediates/cmake/debug/obj/x86/libopencv_jni_shared.a
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
android App/openCV- sdk/build/intermediates/cmake/debug/obj/x86_64/libopencv_jni_shared.a
Binary file not shown.
Binary file modified
BIN
-278 Bytes
(85%)
android App/openCV- sdk/build/intermediates/incremental/debug-mergeNativeLibs/merge-state
Binary file not shown.
2 changes: 1 addition & 1 deletion
2
android App/openCV- sdk/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\Emanuel\OneDrive\Ambiente de Trabalho\Testes de arduino\Rubik Project\rubik-v.0.3.0\android App\openCV- sdk\native\libs"><file name="arm64-v8a/libopencv_java4.so" path="C:\Users\Emanuel\OneDrive\Ambiente de Trabalho\Testes de arduino\Rubik Project\rubik-v.0.3.0\android App\openCV- sdk\native\libs\arm64-v8a\libopencv_java4.so"/><file name="armeabi-v7a/libopencv_java4.so" path="C:\Users\Emanuel\OneDrive\Ambiente de Trabalho\Testes de arduino\Rubik Project\rubik-v.0.3.0\android App\openCV- sdk\native\libs\armeabi-v7a\libopencv_java4.so"/><file name="x86/libopencv_java4.so" path="C:\Users\Emanuel\OneDrive\Ambiente de Trabalho\Testes de arduino\Rubik Project\rubik-v.0.3.0\android App\openCV- sdk\native\libs\x86\libopencv_java4.so"/><file name="x86_64/libopencv_java4.so" path="C:\Users\Emanuel\OneDrive\Ambiente de Trabalho\Testes de arduino\Rubik Project\rubik-v.0.3.0\android App\openCV- sdk\native\libs\x86_64\libopencv_java4.so"/></source></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\Emanuel\OneDrive\Ambiente de Trabalho\Testes de arduino\Rubik Project\rubik-v.0.3.0\android App\openCV- sdk\src\debug\jniLibs"/></dataSet></merger> | ||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\Emanuel\Documents\Rubik Project\Arduino-RubikSolver\android App\openCV- sdk\native\libs"><file name="arm64-v8a/libopencv_java4.so" path="C:\Users\Emanuel\Documents\Rubik Project\Arduino-RubikSolver\android App\openCV- sdk\native\libs\arm64-v8a\libopencv_java4.so"/><file name="armeabi-v7a/libopencv_java4.so" path="C:\Users\Emanuel\Documents\Rubik Project\Arduino-RubikSolver\android App\openCV- sdk\native\libs\armeabi-v7a\libopencv_java4.so"/><file name="x86/libopencv_java4.so" path="C:\Users\Emanuel\Documents\Rubik Project\Arduino-RubikSolver\android App\openCV- sdk\native\libs\x86\libopencv_java4.so"/><file name="x86_64/libopencv_java4.so" path="C:\Users\Emanuel\Documents\Rubik Project\Arduino-RubikSolver\android App\openCV- sdk\native\libs\x86_64\libopencv_java4.so"/></source></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\Emanuel\Documents\Rubik Project\Arduino-RubikSolver\android App\openCV- sdk\src\debug\jniLibs"/></dataSet></merger> |
2 changes: 1 addition & 1 deletion
2
android App/openCV- sdk/build/intermediates/incremental/mergeDebugShaders/merger.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\Emanuel\OneDrive\Ambiente de Trabalho\Testes de arduino\Rubik Project\rubik-v.0.3.0\android App\openCV- sdk\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\Emanuel\OneDrive\Ambiente de Trabalho\Testes de arduino\Rubik Project\rubik-v.0.3.0\android App\openCV- sdk\src\debug\shaders"/></dataSet></merger> | ||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\Emanuel\Documents\Rubik Project\Arduino-RubikSolver\android App\openCV- sdk\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\Emanuel\Documents\Rubik Project\Arduino-RubikSolver\android App\openCV- sdk\src\debug\shaders"/></dataSet></merger> |
2 changes: 1 addition & 1 deletion
2
android App/openCV- sdk/build/intermediates/incremental/packageDebugAssets/merger.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\Emanuel\OneDrive\Ambiente de Trabalho\Testes de arduino\Rubik Project\rubik-v.0.3.0\android App\openCV- sdk\src\main\assets"/><source path="C:\Users\Emanuel\OneDrive\Ambiente de Trabalho\Testes de arduino\Rubik Project\rubik-v.0.3.0\android App\openCV- sdk\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\Emanuel\OneDrive\Ambiente de Trabalho\Testes de arduino\Rubik Project\rubik-v.0.3.0\android App\openCV- sdk\src\debug\assets"/></dataSet></merger> | ||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\Emanuel\Documents\Rubik Project\Arduino-RubikSolver\android App\openCV- sdk\src\main\assets"/><source path="C:\Users\Emanuel\Documents\Rubik Project\Arduino-RubikSolver\android App\openCV- sdk\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\Emanuel\Documents\Rubik Project\Arduino-RubikSolver\android App\openCV- sdk\src\debug\assets"/></dataSet></merger> |
2 changes: 1 addition & 1 deletion
2
...CV- sdk/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
#Sat Aug 28 15:44:07 BST 2021 | ||
#Tue Jun 27 19:13:17 BST 2023 |
4 changes: 2 additions & 2 deletions
4
android App/openCV- sdk/build/intermediates/incremental/packageDebugResources/merger.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
56 changes: 28 additions & 28 deletions
56
android App/openCV- sdk/build/outputs/logs/manifest-merger-debug-report.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,37 +1,37 @@ | ||
-- Merging decision tree log --- | ||
manifest | ||
ADDED from C:\Users\Emanuel\OneDrive\Ambiente de Trabalho\Testes de arduino\Rubik Project\rubik-v.0.3.0\android App\openCV- sdk\java\AndroidManifest.xml:2:1-4:12 | ||
INJECTED from C:\Users\Emanuel\OneDrive\Ambiente de Trabalho\Testes de arduino\Rubik Project\rubik-v.0.3.0\android App\openCV- sdk\java\AndroidManifest.xml:2:1-4:12 | ||
INJECTED from C:\Users\Emanuel\OneDrive\Ambiente de Trabalho\Testes de arduino\Rubik Project\rubik-v.0.3.0\android App\openCV- sdk\java\AndroidManifest.xml:2:1-4:12 | ||
INJECTED from C:\Users\Emanuel\OneDrive\Ambiente de Trabalho\Testes de arduino\Rubik Project\rubik-v.0.3.0\android App\openCV- sdk\java\AndroidManifest.xml:2:1-4:12 | ||
INJECTED from C:\Users\Emanuel\OneDrive\Ambiente de Trabalho\Testes de arduino\Rubik Project\rubik-v.0.3.0\android App\openCV- sdk\java\AndroidManifest.xml:2:1-4:12 | ||
INJECTED from C:\Users\Emanuel\OneDrive\Ambiente de Trabalho\Testes de arduino\Rubik Project\rubik-v.0.3.0\android App\openCV- sdk\java\AndroidManifest.xml:2:1-4:12 | ||
INJECTED from C:\Users\Emanuel\OneDrive\Ambiente de Trabalho\Testes de arduino\Rubik Project\rubik-v.0.3.0\android App\openCV- sdk\java\AndroidManifest.xml:2:1-4:12 | ||
ADDED from C:\Users\Emanuel\Documents\Rubik Project\Arduino-RubikSolver\android App\openCV- sdk\java\AndroidManifest.xml:2:1-4:12 | ||
INJECTED from C:\Users\Emanuel\Documents\Rubik Project\Arduino-RubikSolver\android App\openCV- sdk\java\AndroidManifest.xml:2:1-4:12 | ||
INJECTED from C:\Users\Emanuel\Documents\Rubik Project\Arduino-RubikSolver\android App\openCV- sdk\java\AndroidManifest.xml:2:1-4:12 | ||
INJECTED from C:\Users\Emanuel\Documents\Rubik Project\Arduino-RubikSolver\android App\openCV- sdk\java\AndroidManifest.xml:2:1-4:12 | ||
INJECTED from C:\Users\Emanuel\Documents\Rubik Project\Arduino-RubikSolver\android App\openCV- sdk\java\AndroidManifest.xml:2:1-4:12 | ||
INJECTED from C:\Users\Emanuel\Documents\Rubik Project\Arduino-RubikSolver\android App\openCV- sdk\java\AndroidManifest.xml:2:1-4:12 | ||
INJECTED from C:\Users\Emanuel\Documents\Rubik Project\Arduino-RubikSolver\android App\openCV- sdk\java\AndroidManifest.xml:2:1-4:12 | ||
package | ||
ADDED from C:\Users\Emanuel\OneDrive\Ambiente de Trabalho\Testes de arduino\Rubik Project\rubik-v.0.3.0\android App\openCV- sdk\java\AndroidManifest.xml:3:7-27 | ||
INJECTED from C:\Users\Emanuel\OneDrive\Ambiente de Trabalho\Testes de arduino\Rubik Project\rubik-v.0.3.0\android App\openCV- sdk\java\AndroidManifest.xml | ||
INJECTED from C:\Users\Emanuel\OneDrive\Ambiente de Trabalho\Testes de arduino\Rubik Project\rubik-v.0.3.0\android App\openCV- sdk\java\AndroidManifest.xml | ||
ADDED from C:\Users\Emanuel\Documents\Rubik Project\Arduino-RubikSolver\android App\openCV- sdk\java\AndroidManifest.xml:3:7-27 | ||
INJECTED from C:\Users\Emanuel\Documents\Rubik Project\Arduino-RubikSolver\android App\openCV- sdk\java\AndroidManifest.xml | ||
INJECTED from C:\Users\Emanuel\Documents\Rubik Project\Arduino-RubikSolver\android App\openCV- sdk\java\AndroidManifest.xml | ||
android:versionName | ||
INJECTED from C:\Users\Emanuel\OneDrive\Ambiente de Trabalho\Testes de arduino\Rubik Project\rubik-v.0.3.0\android App\openCV- sdk\java\AndroidManifest.xml | ||
ADDED from C:\Users\Emanuel\OneDrive\Ambiente de Trabalho\Testes de arduino\Rubik Project\rubik-v.0.3.0\android App\openCV- sdk\java\AndroidManifest.xml:2:1-4:12 | ||
INJECTED from C:\Users\Emanuel\OneDrive\Ambiente de Trabalho\Testes de arduino\Rubik Project\rubik-v.0.3.0\android App\openCV- sdk\java\AndroidManifest.xml | ||
INJECTED from C:\Users\Emanuel\Documents\Rubik Project\Arduino-RubikSolver\android App\openCV- sdk\java\AndroidManifest.xml | ||
ADDED from C:\Users\Emanuel\Documents\Rubik Project\Arduino-RubikSolver\android App\openCV- sdk\java\AndroidManifest.xml:2:1-4:12 | ||
INJECTED from C:\Users\Emanuel\Documents\Rubik Project\Arduino-RubikSolver\android App\openCV- sdk\java\AndroidManifest.xml | ||
android:versionCode | ||
INJECTED from C:\Users\Emanuel\OneDrive\Ambiente de Trabalho\Testes de arduino\Rubik Project\rubik-v.0.3.0\android App\openCV- sdk\java\AndroidManifest.xml | ||
ADDED from C:\Users\Emanuel\OneDrive\Ambiente de Trabalho\Testes de arduino\Rubik Project\rubik-v.0.3.0\android App\openCV- sdk\java\AndroidManifest.xml:2:1-4:12 | ||
INJECTED from C:\Users\Emanuel\OneDrive\Ambiente de Trabalho\Testes de arduino\Rubik Project\rubik-v.0.3.0\android App\openCV- sdk\java\AndroidManifest.xml | ||
INJECTED from C:\Users\Emanuel\Documents\Rubik Project\Arduino-RubikSolver\android App\openCV- sdk\java\AndroidManifest.xml | ||
ADDED from C:\Users\Emanuel\Documents\Rubik Project\Arduino-RubikSolver\android App\openCV- sdk\java\AndroidManifest.xml:2:1-4:12 | ||
INJECTED from C:\Users\Emanuel\Documents\Rubik Project\Arduino-RubikSolver\android App\openCV- sdk\java\AndroidManifest.xml | ||
xmlns:android | ||
ADDED from C:\Users\Emanuel\OneDrive\Ambiente de Trabalho\Testes de arduino\Rubik Project\rubik-v.0.3.0\android App\openCV- sdk\java\AndroidManifest.xml:2:11-69 | ||
ADDED from C:\Users\Emanuel\Documents\Rubik Project\Arduino-RubikSolver\android App\openCV- sdk\java\AndroidManifest.xml:2:11-69 | ||
uses-sdk | ||
INJECTED from C:\Users\Emanuel\OneDrive\Ambiente de Trabalho\Testes de arduino\Rubik Project\rubik-v.0.3.0\android App\openCV- sdk\java\AndroidManifest.xml reason: use-sdk injection requested | ||
INJECTED from C:\Users\Emanuel\OneDrive\Ambiente de Trabalho\Testes de arduino\Rubik Project\rubik-v.0.3.0\android App\openCV- sdk\java\AndroidManifest.xml | ||
INJECTED from C:\Users\Emanuel\OneDrive\Ambiente de Trabalho\Testes de arduino\Rubik Project\rubik-v.0.3.0\android App\openCV- sdk\java\AndroidManifest.xml | ||
INJECTED from C:\Users\Emanuel\OneDrive\Ambiente de Trabalho\Testes de arduino\Rubik Project\rubik-v.0.3.0\android App\openCV- sdk\java\AndroidManifest.xml | ||
INJECTED from C:\Users\Emanuel\OneDrive\Ambiente de Trabalho\Testes de arduino\Rubik Project\rubik-v.0.3.0\android App\openCV- sdk\java\AndroidManifest.xml | ||
INJECTED from C:\Users\Emanuel\Documents\Rubik Project\Arduino-RubikSolver\android App\openCV- sdk\java\AndroidManifest.xml reason: use-sdk injection requested | ||
INJECTED from C:\Users\Emanuel\Documents\Rubik Project\Arduino-RubikSolver\android App\openCV- sdk\java\AndroidManifest.xml | ||
INJECTED from C:\Users\Emanuel\Documents\Rubik Project\Arduino-RubikSolver\android App\openCV- sdk\java\AndroidManifest.xml | ||
INJECTED from C:\Users\Emanuel\Documents\Rubik Project\Arduino-RubikSolver\android App\openCV- sdk\java\AndroidManifest.xml | ||
INJECTED from C:\Users\Emanuel\Documents\Rubik Project\Arduino-RubikSolver\android App\openCV- sdk\java\AndroidManifest.xml | ||
android:targetSdkVersion | ||
INJECTED from C:\Users\Emanuel\OneDrive\Ambiente de Trabalho\Testes de arduino\Rubik Project\rubik-v.0.3.0\android App\openCV- sdk\java\AndroidManifest.xml | ||
ADDED from C:\Users\Emanuel\OneDrive\Ambiente de Trabalho\Testes de arduino\Rubik Project\rubik-v.0.3.0\android App\openCV- sdk\java\AndroidManifest.xml | ||
INJECTED from C:\Users\Emanuel\OneDrive\Ambiente de Trabalho\Testes de arduino\Rubik Project\rubik-v.0.3.0\android App\openCV- sdk\java\AndroidManifest.xml | ||
INJECTED from C:\Users\Emanuel\Documents\Rubik Project\Arduino-RubikSolver\android App\openCV- sdk\java\AndroidManifest.xml | ||
ADDED from C:\Users\Emanuel\Documents\Rubik Project\Arduino-RubikSolver\android App\openCV- sdk\java\AndroidManifest.xml | ||
INJECTED from C:\Users\Emanuel\Documents\Rubik Project\Arduino-RubikSolver\android App\openCV- sdk\java\AndroidManifest.xml | ||
android:minSdkVersion | ||
INJECTED from C:\Users\Emanuel\OneDrive\Ambiente de Trabalho\Testes de arduino\Rubik Project\rubik-v.0.3.0\android App\openCV- sdk\java\AndroidManifest.xml | ||
ADDED from C:\Users\Emanuel\OneDrive\Ambiente de Trabalho\Testes de arduino\Rubik Project\rubik-v.0.3.0\android App\openCV- sdk\java\AndroidManifest.xml | ||
INJECTED from C:\Users\Emanuel\OneDrive\Ambiente de Trabalho\Testes de arduino\Rubik Project\rubik-v.0.3.0\android App\openCV- sdk\java\AndroidManifest.xml | ||
INJECTED from C:\Users\Emanuel\Documents\Rubik Project\Arduino-RubikSolver\android App\openCV- sdk\java\AndroidManifest.xml | ||
ADDED from C:\Users\Emanuel\Documents\Rubik Project\Arduino-RubikSolver\android App\openCV- sdk\java\AndroidManifest.xml | ||
INJECTED from C:\Users\Emanuel\Documents\Rubik Project\Arduino-RubikSolver\android App\openCV- sdk\java\AndroidManifest.xml |