Skip to content

P
PARA-Site_WirelessX
Commit 0d661caa authored by rajneesh's avatar rajneesh
Browse files
Options

Android files updated

parent 83f694e4
Hide whitespace changes
Inline Side-by-side
Showing with 78 additions and 73 deletions
WirelessX-Android-Client/.idea/vcs.xml 0 → 100644
View file @ 0d661caa
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$/.." vcs="Git" />
</component>
</project>
\ No newline at end of file
WirelessX-Android-Client/openCVLibrary3412/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
View file @ 0d661caa
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/debug/jniLibs"/></dataSet></merger> <merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/debug/jniLibs"/></dataSet></merger>
\ No newline at end of file \ No newline at end of file
WirelessX-Android-Client/openCVLibrary3412/build/intermediates/incremental/mergeDebugShaders/merger.xml
View file @ 0d661caa
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/debug/shaders"/></dataSet></merger> <merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/debug/shaders"/></dataSet></merger>
\ No newline at end of file \ No newline at end of file
WirelessX-Android-Client/openCVLibrary3412/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml
View file @ 0d661caa
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/jniLibs"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/release/jniLibs"/></dataSet></merger> <merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/jniLibs"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/release/jniLibs"/></dataSet></merger>
\ No newline at end of file \ No newline at end of file
WirelessX-Android-Client/openCVLibrary3412/build/intermediates/incremental/mergeReleaseShaders/merger.xml
View file @ 0d661caa
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/shaders"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/release/shaders"/></dataSet></merger> <merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/shaders"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/release/shaders"/></dataSet></merger>
\ No newline at end of file \ No newline at end of file
WirelessX-Android-Client/openCVLibrary3412/build/intermediates/incremental/packageDebugAssets/merger.xml
View file @ 0d661caa
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/assets"/><source path="/home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/build/intermediates/shader_assets/debug/out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/debug/assets"/></dataSet></merger> <merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/assets"/><source path="/home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/build/intermediates/shader_assets/debug/out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/debug/assets"/></dataSet></merger>
\ No newline at end of file \ No newline at end of file
WirelessX-Android-Client/openCVLibrary3412/build/intermediates/incremental/packageDebugResources/merger.xml
View file @ 0d661caa
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/res"/><source path="/home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/build/generated/res/rs/debug"/><source path="/home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/res"><file path="/home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/res/values/attrs.xml" qualifiers=""><declare-styleable name="CameraBridgeViewBase"> <merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/res"/><source path="/home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/build/generated/res/rs/debug"/><source path="/home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/res"><file path="/home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/res/values/attrs.xml" qualifiers=""><declare-styleable name="CameraBridgeViewBase">
<attr format="boolean" name="show_fps"/> <attr format="boolean" name="show_fps"/>
<attr format="integer" name="camera_id"> <attr format="integer" name="camera_id">
<enum name="any" value="-1"/> <enum name="any" value="-1"/>
<enum name="back" value="99"/> <enum name="back" value="99"/>
<enum name="front" value="98"/> <enum name="front" value="98"/>
</attr> </attr>
</declare-styleable></file></source><source path="/home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/build/generated/res/rs/debug"/><source path="/home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/debug/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/debug/res"/></dataSet><mergedItems><configuration qualifiers=""><declare-styleable name="CameraBridgeViewBase"> </declare-styleable></file></source><source path="/home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/build/generated/res/rs/debug"/><source path="/home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/debug/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/debug/res"/></dataSet><mergedItems><configuration qualifiers=""><declare-styleable name="CameraBridgeViewBase">
<attr format="boolean" name="show_fps"/> <attr format="boolean" name="show_fps"/>
<attr format="integer" name="camera_id"> <attr format="integer" name="camera_id">
<enum name="any" value="-1"/> <enum name="any" value="-1"/>
......
WirelessX-Android-Client/openCVLibrary3412/build/intermediates/incremental/packageReleaseAssets/merger.xml
View file @ 0d661caa
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/assets"/><source path="/home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/build/intermediates/shader_assets/release/out"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/release/assets"/></dataSet></merger> <merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/assets"/><source path="/home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/build/intermediates/shader_assets/release/out"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/release/assets"/></dataSet></merger>
\ No newline at end of file \ No newline at end of file
WirelessX-Android-Client/openCVLibrary3412/build/intermediates/incremental/packageReleaseResources/merger.xml
View file @ 0d661caa
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/res"/><source path="/home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/build/generated/res/rs/release"/><source path="/home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/build/generated/res/resValues/release"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/res"><file path="/home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/res/values/attrs.xml" qualifiers=""><declare-styleable name="CameraBridgeViewBase"> <merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/res"/><source path="/home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/build/generated/res/rs/release"/><source path="/home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/build/generated/res/resValues/release"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/res"><file path="/home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/res/values/attrs.xml" qualifiers=""><declare-styleable name="CameraBridgeViewBase">
<attr format="boolean" name="show_fps"/> <attr format="boolean" name="show_fps"/>
<attr format="integer" name="camera_id"> <attr format="integer" name="camera_id">
<enum name="any" value="-1"/> <enum name="any" value="-1"/>
<enum name="back" value="99"/> <enum name="back" value="99"/>
<enum name="front" value="98"/> <enum name="front" value="98"/>
</attr> </attr>
</declare-styleable></file></source><source path="/home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/build/generated/res/rs/release"/><source path="/home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/build/generated/res/resValues/release"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="release$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/release/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="release" generated-set="release$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/release/res"/></dataSet><mergedItems><configuration qualifiers=""><declare-styleable name="CameraBridgeViewBase"> </declare-styleable></file></source><source path="/home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/build/generated/res/rs/release"/><source path="/home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/build/generated/res/resValues/release"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="release$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/release/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="release" generated-set="release$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/release/res"/></dataSet><mergedItems><configuration qualifiers=""><declare-styleable name="CameraBridgeViewBase">
<attr format="boolean" name="show_fps"/> <attr format="boolean" name="show_fps"/>
<attr format="integer" name="camera_id"> <attr format="integer" name="camera_id">
<enum name="any" value="-1"/> <enum name="any" value="-1"/>
......
WirelessX-Android-Client/openCVLibrary3412/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
View file @ 0d661caa
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
6 6
7 <uses-sdk 7 <uses-sdk
8 android:minSdkVersion="23" 8 android:minSdkVersion="23"
8-->/home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml 8-->/home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml
9 android:targetSdkVersion="30" /> 9 android:targetSdkVersion="30" />
9-->/home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml 9-->/home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml
10 10
11</manifest> 11</manifest>
WirelessX-Android-Client/openCVLibrary3412/build/intermediates/manifest_merge_blame_file/release/manifest-merger-blame-release-report.txt
View file @ 0d661caa
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
6 6
7 <uses-sdk 7 <uses-sdk
8 android:minSdkVersion="23" 8 android:minSdkVersion="23"
8-->/home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml 8-->/home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml
9 android:targetSdkVersion="30" /> 9 android:targetSdkVersion="30" />
9-->/home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml 9-->/home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml
10 10
11</manifest> 11</manifest>
WirelessX-Android-Client/openCVLibrary3412/build/outputs/logs/manifest-merger-debug-report.txt
View file @ 0d661caa
-- Merging decision tree log --- -- Merging decision tree log ---
manifest manifest
ADDED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml:2:1-7:12 ADDED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml:2:1-7:12
INJECTED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml:2:1-7:12 INJECTED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml:2:1-7:12
INJECTED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml:2:1-7:12 INJECTED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml:2:1-7:12
INJECTED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml:2:1-7:12 INJECTED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml:2:1-7:12
INJECTED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml:2:1-7:12 INJECTED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml:2:1-7:12
INJECTED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml:2:1-7:12 INJECTED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml:2:1-7:12
INJECTED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml:2:1-7:12 INJECTED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml:2:1-7:12
package package
ADDED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml:3:7-27 ADDED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml:3:7-27
INJECTED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml INJECTED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml
INJECTED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml INJECTED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml
android:versionName android:versionName
ADDED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml:5:7-35 ADDED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml:5:7-35
INJECTED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml INJECTED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml
INJECTED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml INJECTED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml
xmlns:android xmlns:android
ADDED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml:2:11-69 ADDED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml:2:11-69
android:versionCode android:versionCode
ADDED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml:4:7-34 ADDED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml:4:7-34
INJECTED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml INJECTED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml
INJECTED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml INJECTED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml
uses-sdk uses-sdk
INJECTED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml reason: use-sdk injection requested INJECTED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml reason: use-sdk injection requested
INJECTED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml INJECTED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml
INJECTED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml INJECTED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml
INJECTED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml INJECTED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml
INJECTED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml INJECTED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml
android:targetSdkVersion android:targetSdkVersion
INJECTED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml INJECTED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml
ADDED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml ADDED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml
INJECTED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml INJECTED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml
android:minSdkVersion android:minSdkVersion
INJECTED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml INJECTED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml
ADDED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml ADDED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml
INJECTED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml INJECTED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml
WirelessX-Android-Client/openCVLibrary3412/build/outputs/logs/manifest-merger-release-report.txt
View file @ 0d661caa
-- Merging decision tree log --- -- Merging decision tree log ---
manifest manifest
ADDED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml:2:1-7:12 ADDED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml:2:1-7:12
INJECTED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml:2:1-7:12 INJECTED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml:2:1-7:12
INJECTED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml:2:1-7:12 INJECTED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml:2:1-7:12
INJECTED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml:2:1-7:12 INJECTED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml:2:1-7:12
INJECTED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml:2:1-7:12 INJECTED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml:2:1-7:12
INJECTED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml:2:1-7:12 INJECTED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml:2:1-7:12
INJECTED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml:2:1-7:12 INJECTED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml:2:1-7:12
package package
ADDED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml:3:7-27 ADDED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml:3:7-27
INJECTED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml INJECTED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml
INJECTED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml INJECTED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml
android:versionName android:versionName
ADDED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml:5:7-35 ADDED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml:5:7-35
INJECTED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml INJECTED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml
INJECTED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml INJECTED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml
xmlns:android xmlns:android
ADDED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml:2:11-69 ADDED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml:2:11-69
android:versionCode android:versionCode
ADDED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml:4:7-34 ADDED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml:4:7-34
INJECTED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml INJECTED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml
INJECTED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml INJECTED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml
uses-sdk uses-sdk
INJECTED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml reason: use-sdk injection requested INJECTED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml reason: use-sdk injection requested
INJECTED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml INJECTED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml
INJECTED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml INJECTED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml
INJECTED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml INJECTED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml
INJECTED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml INJECTED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml
android:targetSdkVersion android:targetSdkVersion
INJECTED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml INJECTED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml
ADDED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml ADDED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml
INJECTED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml INJECTED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml
android:minSdkVersion android:minSdkVersion
INJECTED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml INJECTED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml
ADDED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml ADDED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml
INJECTED from /home/raj/Mobile/Backups/4-Wireless-X-Android-KeyboardBasicsKeys-Mouse-Webcam/openCVLibrary3412/src/main/AndroidManifest.xml INJECTED from /home/raj/PARA-Site_WirelessX/WirelessX-Android-Client/openCVLibrary3412/src/main/AndroidManifest.xml
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment