From 6462f2f5fe426fa378272d11484f7e11241226e3 Mon Sep 17 00:00:00 2001 From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674> Date: 星期一, 27 三月 2017 18:06:52 +0800 Subject: [PATCH] --- VisitFace/DemoForBsk/app/build/outputs/logs/manifest-merger-debug-report.txt | 132 +++++++++++++++++++++++++------------------ 1 files changed, 76 insertions(+), 56 deletions(-) diff --git a/VisitFace/DemoForBsk/app/build/outputs/logs/manifest-merger-debug-report.txt b/VisitFace/DemoForBsk/app/build/outputs/logs/manifest-merger-debug-report.txt index ea2977b..de207dd 100644 --- a/VisitFace/DemoForBsk/app/build/outputs/logs/manifest-merger-debug-report.txt +++ b/VisitFace/DemoForBsk/app/build/outputs/logs/manifest-merger-debug-report.txt @@ -1,89 +1,109 @@ -- Merging decision tree log --- manifest -ADDED from D:\work\VisitFace\DemoForBsk\app\src\main\AndroidManifest.xml:2:1-32:12 +ADDED from D:\work\DemoForBsk\app\src\main\AndroidManifest.xml:2:1-32:12 package - ADDED from D:\work\VisitFace\DemoForBsk\app\src\main\AndroidManifest.xml:3:5-41 - INJECTED from D:\work\VisitFace\DemoForBsk\app\src\main\AndroidManifest.xml - INJECTED from D:\work\VisitFace\DemoForBsk\app\src\main\AndroidManifest.xml + ADDED from D:\work\DemoForBsk\app\src\main\AndroidManifest.xml:3:5-41 + INJECTED from D:\work\DemoForBsk\app\src\main\AndroidManifest.xml + INJECTED from D:\work\DemoForBsk\app\src\main\AndroidManifest.xml android:versionName - INJECTED from D:\work\VisitFace\DemoForBsk\app\src\main\AndroidManifest.xml - INJECTED from D:\work\VisitFace\DemoForBsk\app\src\main\AndroidManifest.xml + INJECTED from D:\work\DemoForBsk\app\src\main\AndroidManifest.xml + INJECTED from D:\work\DemoForBsk\app\src\main\AndroidManifest.xml xmlns:android - ADDED from D:\work\VisitFace\DemoForBsk\app\src\main\AndroidManifest.xml:2:11-69 + ADDED from D:\work\DemoForBsk\app\src\main\AndroidManifest.xml:2:11-69 android:versionCode - INJECTED from D:\work\VisitFace\DemoForBsk\app\src\main\AndroidManifest.xml - INJECTED from D:\work\VisitFace\DemoForBsk\app\src\main\AndroidManifest.xml + INJECTED from D:\work\DemoForBsk\app\src\main\AndroidManifest.xml + INJECTED from D:\work\DemoForBsk\app\src\main\AndroidManifest.xml uses-permission#android.permission.WRITE_EXTERNAL_STORAGE -ADDED from D:\work\VisitFace\DemoForBsk\app\src\main\AndroidManifest.xml:5:5-81 +ADDED from D:\work\DemoForBsk\app\src\main\AndroidManifest.xml:5:5-81 +MERGED from [com.lzy.net:okhttputils:1.8.1] D:\work\DemoForBsk\app\build\intermediates\exploded-aar\com.lzy.net\okhttputils\1.8.1\AndroidManifest.xml:13:5-81 android:name - ADDED from D:\work\VisitFace\DemoForBsk\app\src\main\AndroidManifest.xml:5:22-78 + ADDED from D:\work\DemoForBsk\app\src\main\AndroidManifest.xml:5:22-78 uses-feature#0x00020000 -ADDED from D:\work\VisitFace\DemoForBsk\app\src\main\AndroidManifest.xml:6:5-54 +ADDED from D:\work\DemoForBsk\app\src\main\AndroidManifest.xml:6:5-54 android:glEsVersion - ADDED from D:\work\VisitFace\DemoForBsk\app\src\main\AndroidManifest.xml:6:19-51 + ADDED from D:\work\DemoForBsk\app\src\main\AndroidManifest.xml:6:19-51 uses-permission#android.permission.INTERNET -ADDED from D:\work\VisitFace\DemoForBsk\app\src\main\AndroidManifest.xml:9:5-83 +ADDED from D:\work\DemoForBsk\app\src\main\AndroidManifest.xml:9:5-83 +MERGED from [com.lzy.net:okhttputils:1.8.1] D:\work\DemoForBsk\app\build\intermediates\exploded-aar\com.lzy.net\okhttputils\1.8.1\AndroidManifest.xml:11:5-67 android:name - ADDED from D:\work\VisitFace\DemoForBsk\app\src\main\AndroidManifest.xml:9:22-64 + ADDED from D:\work\DemoForBsk\app\src\main\AndroidManifest.xml:9:22-64 application -ADDED from D:\work\VisitFace\DemoForBsk\app\src\main\AndroidManifest.xml:11:5-30:19 -MERGED from [com.android.support:design:23.1.0] D:\work\VisitFace\DemoForBsk\app\build\intermediates\exploded-aar\com.android.support\design\23.1.0\AndroidManifest.xml:22:5-20 -MERGED from [com.camnter.easyrecyclerview:easyrecyclerview:1.3] D:\work\VisitFace\DemoForBsk\app\build\intermediates\exploded-aar\com.camnter.easyrecyclerview\easyrecyclerview\1.3\AndroidManifest.xml:11:5-14:19 -MERGED from [com.android.support:appcompat-v7:23.1.0] D:\work\VisitFace\DemoForBsk\app\build\intermediates\exploded-aar\com.android.support\appcompat-v7\23.1.0\AndroidManifest.xml:22:5-20 -MERGED from [com.android.support:support-v4:23.1.0] D:\work\VisitFace\DemoForBsk\app\build\intermediates\exploded-aar\com.android.support\support-v4\23.1.0\AndroidManifest.xml:22:5-20 -MERGED from [com.wx.wheelview:wheelview:1.3.3] D:\work\VisitFace\DemoForBsk\app\build\intermediates\exploded-aar\com.wx.wheelview\wheelview\1.3.3\AndroidManifest.xml:11:5-14:19 +ADDED from D:\work\DemoForBsk\app\src\main\AndroidManifest.xml:11:5-30:19 +MERGED from [com.android.support:design:23.1.0] D:\work\DemoForBsk\app\build\intermediates\exploded-aar\com.android.support\design\23.1.0\AndroidManifest.xml:22:5-20 +MERGED from [com.camnter.easyrecyclerview:easyrecyclerview:1.3] D:\work\DemoForBsk\app\build\intermediates\exploded-aar\com.camnter.easyrecyclerview\easyrecyclerview\1.3\AndroidManifest.xml:11:5-14:19 +MERGED from [com.android.support:appcompat-v7:23.1.0] D:\work\DemoForBsk\app\build\intermediates\exploded-aar\com.android.support\appcompat-v7\23.1.0\AndroidManifest.xml:22:5-20 +MERGED from [com.android.support:support-v4:23.1.0] D:\work\DemoForBsk\app\build\intermediates\exploded-aar\com.android.support\support-v4\23.1.0\AndroidManifest.xml:22:5-20 +MERGED from [com.wx.wheelview:wheelview:1.3.3] D:\work\DemoForBsk\app\build\intermediates\exploded-aar\com.wx.wheelview\wheelview\1.3.3\AndroidManifest.xml:11:5-14:19 +MERGED from [com.lzy.net:okhttpserver:1.0.3] D:\work\DemoForBsk\app\build\intermediates\exploded-aar\com.lzy.net\okhttpserver\1.0.3\AndroidManifest.xml:11:5-13:19 android:label - ADDED from D:\work\VisitFace\DemoForBsk\app\src\main\AndroidManifest.xml:15:9-41 + ADDED from D:\work\DemoForBsk\app\src\main\AndroidManifest.xml:15:9-41 android:supportsRtl - ADDED from D:\work\VisitFace\DemoForBsk\app\src\main\AndroidManifest.xml:16:9-35 + ADDED from D:\work\DemoForBsk\app\src\main\AndroidManifest.xml:16:9-35 android:allowBackup - ADDED from D:\work\VisitFace\DemoForBsk\app\src\main\AndroidManifest.xml:13:9-35 + ADDED from D:\work\DemoForBsk\app\src\main\AndroidManifest.xml:13:9-35 android:icon - ADDED from D:\work\VisitFace\DemoForBsk\app\src\main\AndroidManifest.xml:14:9-43 + ADDED from D:\work\DemoForBsk\app\src\main\AndroidManifest.xml:14:9-43 android:theme - ADDED from D:\work\VisitFace\DemoForBsk\app\src\main\AndroidManifest.xml:17:9-40 + ADDED from D:\work\DemoForBsk\app\src\main\AndroidManifest.xml:17:9-40 android:name - ADDED from D:\work\VisitFace\DemoForBsk\app\src\main\AndroidManifest.xml:12:9-45 + ADDED from D:\work\DemoForBsk\app\src\main\AndroidManifest.xml:12:9-45 activity#com.bsk.zhangbo.demoforbsk.ui.activity.MainActivity -ADDED from D:\work\VisitFace\DemoForBsk\app\src\main\AndroidManifest.xml:18:9-27:20 +ADDED from D:\work\DemoForBsk\app\src\main\AndroidManifest.xml:18:9-27:20 android:screenOrientation - ADDED from D:\work\VisitFace\DemoForBsk\app\src\main\AndroidManifest.xml:20:13-50 + ADDED from D:\work\DemoForBsk\app\src\main\AndroidManifest.xml:20:13-50 android:windowSoftInputMode - ADDED from D:\work\VisitFace\DemoForBsk\app\src\main\AndroidManifest.xml:21:13-52 + ADDED from D:\work\DemoForBsk\app\src\main\AndroidManifest.xml:21:13-52 android:name - ADDED from D:\work\VisitFace\DemoForBsk\app\src\main\AndroidManifest.xml:19:13-53 + ADDED from D:\work\DemoForBsk\app\src\main\AndroidManifest.xml:19:13-53 intent-filter#android.intent.action.MAIN+android.intent.category.LAUNCHER -ADDED from D:\work\VisitFace\DemoForBsk\app\src\main\AndroidManifest.xml:22:13-26:29 +ADDED from D:\work\DemoForBsk\app\src\main\AndroidManifest.xml:22:13-26:29 action#android.intent.action.MAIN -ADDED from D:\work\VisitFace\DemoForBsk\app\src\main\AndroidManifest.xml:23:17-69 +ADDED from D:\work\DemoForBsk\app\src\main\AndroidManifest.xml:23:17-69 android:name - ADDED from D:\work\VisitFace\DemoForBsk\app\src\main\AndroidManifest.xml:23:25-66 + ADDED from D:\work\DemoForBsk\app\src\main\AndroidManifest.xml:23:25-66 category#android.intent.category.LAUNCHER -ADDED from D:\work\VisitFace\DemoForBsk\app\src\main\AndroidManifest.xml:25:17-77 +ADDED from D:\work\DemoForBsk\app\src\main\AndroidManifest.xml:25:17-77 android:name - ADDED from D:\work\VisitFace\DemoForBsk\app\src\main\AndroidManifest.xml:25:27-74 -activity#com.bsk.zhangbo.demoforbsk.ui.activity.TestARGB8888Actiivty -ADDED from D:\work\VisitFace\DemoForBsk\app\src\main\AndroidManifest.xml:28:9-29:62 + ADDED from D:\work\DemoForBsk\app\src\main\AndroidManifest.xml:25:27-74 +activity#com.bsk.zhangbo.demoforbsk.ui.activity.TestARGB8888Activity +ADDED from D:\work\DemoForBsk\app\src\main\AndroidManifest.xml:28:9-29:62 android:screenOrientation - ADDED from D:\work\VisitFace\DemoForBsk\app\src\main\AndroidManifest.xml:29:13-50 + ADDED from D:\work\DemoForBsk\app\src\main\AndroidManifest.xml:29:13-50 android:name - ADDED from D:\work\VisitFace\DemoForBsk\app\src\main\AndroidManifest.xml:28:19-67 + ADDED from D:\work\DemoForBsk\app\src\main\AndroidManifest.xml:28:19-67 uses-sdk -INJECTED from D:\work\VisitFace\DemoForBsk\app\src\main\AndroidManifest.xml reason: use-sdk injection requested -MERGED from [com.android.support:design:23.1.0] D:\work\VisitFace\DemoForBsk\app\build\intermediates\exploded-aar\com.android.support\design\23.1.0\AndroidManifest.xml:20:5-43 -MERGED from [com.camnter.easyrecyclerview:easyrecyclerview:1.3] D:\work\VisitFace\DemoForBsk\app\build\intermediates\exploded-aar\com.camnter.easyrecyclerview\easyrecyclerview\1.3\AndroidManifest.xml:7:5-9:41 -MERGED from [com.android.support:appcompat-v7:23.1.0] D:\work\VisitFace\DemoForBsk\app\build\intermediates\exploded-aar\com.android.support\appcompat-v7\23.1.0\AndroidManifest.xml:20:5-43 -MERGED from [com.android.support:recyclerview-v7:23.1.0] D:\work\VisitFace\DemoForBsk\app\build\intermediates\exploded-aar\com.android.support\recyclerview-v7\23.1.0\AndroidManifest.xml:20:5-43 -MERGED from [com.android.support:support-v4:23.1.0] D:\work\VisitFace\DemoForBsk\app\build\intermediates\exploded-aar\com.android.support\support-v4\23.1.0\AndroidManifest.xml:20:5-43 -MERGED from [com.facebook.fresco:fresco:1.1.0] D:\work\VisitFace\DemoForBsk\app\build\intermediates\exploded-aar\com.facebook.fresco\fresco\1.1.0\AndroidManifest.xml:5:5-7:41 -MERGED from [com.facebook.fresco:drawee:1.1.0] D:\work\VisitFace\DemoForBsk\app\build\intermediates\exploded-aar\com.facebook.fresco\drawee\1.1.0\AndroidManifest.xml:5:5-7:41 -MERGED from [com.facebook.fresco:imagepipeline:1.1.0] D:\work\VisitFace\DemoForBsk\app\build\intermediates\exploded-aar\com.facebook.fresco\imagepipeline\1.1.0\AndroidManifest.xml:5:5-7:41 -MERGED from [com.facebook.fresco:imagepipeline-base:1.1.0] D:\work\VisitFace\DemoForBsk\app\build\intermediates\exploded-aar\com.facebook.fresco\imagepipeline-base\1.1.0\AndroidManifest.xml:5:5-7:41 -MERGED from [com.facebook.fresco:fbcore:1.1.0] D:\work\VisitFace\DemoForBsk\app\build\intermediates\exploded-aar\com.facebook.fresco\fbcore\1.1.0\AndroidManifest.xml:5:5-7:41 -MERGED from [com.wx.wheelview:wheelview:1.3.3] D:\work\VisitFace\DemoForBsk\app\build\intermediates\exploded-aar\com.wx.wheelview\wheelview\1.3.3\AndroidManifest.xml:7:5-9:41 +INJECTED from D:\work\DemoForBsk\app\src\main\AndroidManifest.xml reason: use-sdk injection requested +MERGED from [com.android.support:design:23.1.0] D:\work\DemoForBsk\app\build\intermediates\exploded-aar\com.android.support\design\23.1.0\AndroidManifest.xml:20:5-43 +MERGED from [com.camnter.easyrecyclerview:easyrecyclerview:1.3] D:\work\DemoForBsk\app\build\intermediates\exploded-aar\com.camnter.easyrecyclerview\easyrecyclerview\1.3\AndroidManifest.xml:7:5-9:41 +MERGED from [com.android.support:appcompat-v7:23.1.0] D:\work\DemoForBsk\app\build\intermediates\exploded-aar\com.android.support\appcompat-v7\23.1.0\AndroidManifest.xml:20:5-43 +MERGED from [com.android.support:recyclerview-v7:23.1.0] D:\work\DemoForBsk\app\build\intermediates\exploded-aar\com.android.support\recyclerview-v7\23.1.0\AndroidManifest.xml:20:5-43 +MERGED from [com.android.support:support-v4:23.1.0] D:\work\DemoForBsk\app\build\intermediates\exploded-aar\com.android.support\support-v4\23.1.0\AndroidManifest.xml:20:5-43 +MERGED from [com.facebook.fresco:fresco:1.1.0] D:\work\DemoForBsk\app\build\intermediates\exploded-aar\com.facebook.fresco\fresco\1.1.0\AndroidManifest.xml:5:5-7:41 +MERGED from [com.facebook.fresco:drawee:1.1.0] D:\work\DemoForBsk\app\build\intermediates\exploded-aar\com.facebook.fresco\drawee\1.1.0\AndroidManifest.xml:5:5-7:41 +MERGED from [com.facebook.fresco:imagepipeline:1.1.0] D:\work\DemoForBsk\app\build\intermediates\exploded-aar\com.facebook.fresco\imagepipeline\1.1.0\AndroidManifest.xml:5:5-7:41 +MERGED from [com.facebook.fresco:imagepipeline-base:1.1.0] D:\work\DemoForBsk\app\build\intermediates\exploded-aar\com.facebook.fresco\imagepipeline-base\1.1.0\AndroidManifest.xml:5:5-7:41 +MERGED from [com.facebook.fresco:fbcore:1.1.0] D:\work\DemoForBsk\app\build\intermediates\exploded-aar\com.facebook.fresco\fbcore\1.1.0\AndroidManifest.xml:5:5-7:41 +MERGED from [com.wx.wheelview:wheelview:1.3.3] D:\work\DemoForBsk\app\build\intermediates\exploded-aar\com.wx.wheelview\wheelview\1.3.3\AndroidManifest.xml:7:5-9:41 +MERGED from [com.orhanobut:logger:1.15] D:\work\DemoForBsk\app\build\intermediates\exploded-aar\com.orhanobut\logger\1.15\AndroidManifest.xml:6:5-43 +MERGED from [com.lzy.net:okhttpserver:1.0.3] D:\work\DemoForBsk\app\build\intermediates\exploded-aar\com.lzy.net\okhttpserver\1.0.3\AndroidManifest.xml:7:5-9:41 +MERGED from [com.lzy.net:okhttputils:1.8.1] D:\work\DemoForBsk\app\build\intermediates\exploded-aar\com.lzy.net\okhttputils\1.8.1\AndroidManifest.xml:7:5-9:41 android:targetSdkVersion - INJECTED from D:\work\VisitFace\DemoForBsk\app\src\main\AndroidManifest.xml - INJECTED from D:\work\VisitFace\DemoForBsk\app\src\main\AndroidManifest.xml + INJECTED from D:\work\DemoForBsk\app\src\main\AndroidManifest.xml + INJECTED from D:\work\DemoForBsk\app\src\main\AndroidManifest.xml android:minSdkVersion - INJECTED from D:\work\VisitFace\DemoForBsk\app\src\main\AndroidManifest.xml - INJECTED from D:\work\VisitFace\DemoForBsk\app\src\main\AndroidManifest.xml + INJECTED from D:\work\DemoForBsk\app\src\main\AndroidManifest.xml + INJECTED from D:\work\DemoForBsk\app\src\main\AndroidManifest.xml +service#com.lzy.okhttpserver.download.DownloadService +ADDED from [com.lzy.net:okhttpserver:1.0.3] D:\work\DemoForBsk\app\build\intermediates\exploded-aar\com.lzy.net\okhttpserver\1.0.3\AndroidManifest.xml:12:9-81 + android:name + ADDED from [com.lzy.net:okhttpserver:1.0.3] D:\work\DemoForBsk\app\build\intermediates\exploded-aar\com.lzy.net\okhttpserver\1.0.3\AndroidManifest.xml:12:18-78 +uses-permission#android.permission.READ_EXTERNAL_STORAGE +ADDED from [com.lzy.net:okhttputils:1.8.1] D:\work\DemoForBsk\app\build\intermediates\exploded-aar\com.lzy.net\okhttputils\1.8.1\AndroidManifest.xml:12:5-80 + android:name + ADDED from [com.lzy.net:okhttputils:1.8.1] D:\work\DemoForBsk\app\build\intermediates\exploded-aar\com.lzy.net\okhttputils\1.8.1\AndroidManifest.xml:12:22-77 +uses-permission#android.permission.MOUNT_UNMOUNT_FILESYSTEMS +ADDED from [com.lzy.net:okhttputils:1.8.1] D:\work\DemoForBsk\app\build\intermediates\exploded-aar\com.lzy.net\okhttputils\1.8.1\AndroidManifest.xml:14:5-84 + android:name + ADDED from [com.lzy.net:okhttputils:1.8.1] D:\work\DemoForBsk\app\build\intermediates\exploded-aar\com.lzy.net\okhttputils\1.8.1\AndroidManifest.xml:14:22-81 +android:uses-permission#android.permission.READ_EXTERNAL_STORAGE +IMPLIED from D:\work\DemoForBsk\app\src\main\AndroidManifest.xml:2:1-32:12 reason: com.lzy.okhttputils requested WRITE_EXTERNAL_STORAGE -- Gitblit v1.8.0