From 30d164851ac3d4e7397e010baa24a8e5cb0dc090 Mon Sep 17 00:00:00 2001 From: Joe Robinson Date: Tue, 15 Dec 2015 20:43:45 +0000 Subject: Migrate to IntelliJ format, also contains some minor logging changes and moved libraries --- .../outputs/logs/manifest-merger-debug-report.txt | 123 +++++++++++++++++++++ 1 file changed, 123 insertions(+) create mode 100644 app/build/outputs/logs/manifest-merger-debug-report.txt (limited to 'app/build/outputs/logs/manifest-merger-debug-report.txt') diff --git a/app/build/outputs/logs/manifest-merger-debug-report.txt b/app/build/outputs/logs/manifest-merger-debug-report.txt new file mode 100644 index 0000000..dcd3f02 --- /dev/null +++ b/app/build/outputs/logs/manifest-merger-debug-report.txt @@ -0,0 +1,123 @@ +-- Merging decision tree log --- +manifest +ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:2:1-86:12 + package + ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:3:5-35 + INJECTED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml + INJECTED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml + android:versionName + ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:5:5-30 + INJECTED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml + INJECTED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml + android:versionCode + ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:4:5-28 + INJECTED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml + INJECTED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml + xmlns:android + ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:2:11-69 +uses-sdk +ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:7:5-9:41 + android:targetSdkVersion + ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:9:9-38 + INJECTED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml + INJECTED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml + android:minSdkVersion + ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:8:9-34 + INJECTED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml + INJECTED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml +application +ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:11:5-75:19 + android:label + ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:13:9-41 + android:icon + ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:12:9-38 + android:theme + ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:14:9-42 +activity#com.lc8n.blauploader.HomeScreen +ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:15:9-23:20 + android:label + ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:17:13-45 + android:name + ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:16:13-59 +intent-filter#android.intent.action.MAIN+android.intent.category.LAUNCHER +ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:18:13-22:29 +action#android.intent.action.MAIN +ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:19:17-69 + android:name + ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:19:25-66 +category#android.intent.category.LAUNCHER +ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:21:17-77 + android:name + ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:21:27-74 +activity#com.lc8n.blauploader.FileBrowser +ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:24:9-36:20 + android:label + ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:27:13-45 + android:windowSoftInputMode + ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:26:13-54 + android:name + ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:25:13-60 +activity#com.lc8n.blauploader.FileShare +ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:37:9-48:20 + android:label + ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:39:13-38 + android:windowSoftInputMode + ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:40:13-61 + android:name + ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:38:13-58 +intent-filter#android.intent.action.SEND+android.intent.category.DEFAULT +ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:41:13-47:29 +action#android.intent.action.SEND +ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:42:17-69 + android:name + ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:42:25-66 +category#android.intent.category.DEFAULT +ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:44:17-76 + android:name + ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:44:27-73 +data +ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:46:17-48 + android:mimeType + ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:46:23-45 +activity#com.lc8n.blauploader.SoundRecorder +ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:49:9-59:20 + android:label + ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:51:13-45 + android:name + ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:50:13-62 +activity#com.lc8n.blauploader.UploadLocation +ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:60:9-70:20 + android:label + ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:62:13-45 + android:name + ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:61:13-63 +activity#com.lc8n.blauploader.MainActivity +ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:71:9-74:20 + android:label + ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:73:13-56 + android:name + ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:72:13-61 +uses-permission#android.permission.INTERNET +ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:77:5-78:23 + android:name + ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:77:22-64 +uses-permission#android.permission.RECORD_AUDIO +ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:79:5-71 + android:name + ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:79:22-68 +uses-permission#android.permission.WRITE_EXTERNAL_STORAGE +ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:80:5-81 + android:name + ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:80:22-78 +uses-permission#android.permission.ACCESS_FINE_LOCATION +ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:81:5-79 + android:name + ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:81:22-76 +uses-permission#android.permission.ACCESS_COARSE_LOCATION +ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:82:5-81 + android:name + ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:82:22-78 +uses-permission#android.permission.SEND_SMS +ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:83:5-67 + android:name + ADDED from /home/joe/AndroidstudioProjects/blauploader1/app/src/main/AndroidManifest.xml:83:22-64 -- cgit v1.2.3