From 821b1bea4a77497506c3e22529ba76b2f84cceb7 Mon Sep 17 00:00:00 2001 From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674> Date: 星期三, 03 五月 2017 11:57:01 +0800 Subject: [PATCH] --- VisitFace/RtspNativeCodec/app/build/outputs/logs/manifest-merger-debug-report.txt | 70 +++++++++++++++++++++++++---------- 1 files changed, 50 insertions(+), 20 deletions(-) diff --git a/VisitFace/RtspNativeCodec/app/build/outputs/logs/manifest-merger-debug-report.txt b/VisitFace/RtspNativeCodec/app/build/outputs/logs/manifest-merger-debug-report.txt index c571a2d..465df2d 100644 --- a/VisitFace/RtspNativeCodec/app/build/outputs/logs/manifest-merger-debug-report.txt +++ b/VisitFace/RtspNativeCodec/app/build/outputs/logs/manifest-merger-debug-report.txt @@ -1,46 +1,76 @@ -- Merging decision tree log --- manifest -ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:2:1-23:12 +ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:2:1-30:12 package - ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:3:11-44 + ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:3:1-34 INJECTED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml INJECTED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml xmlns:android ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:2:11-69 uses-feature#0x00020000 -ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:5:3-52 +ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:5:1-50 android:glEsVersion - ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:5:17-49 + ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:5:15-47 uses-permission#android.permission.INTERNET -ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:8:3-81 +ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:8:1-62 android:name - ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:8:20-62 + ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:8:18-60 +uses-permission#android.permission.READ_EXTERNAL_STORAGE +ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:9:1-75 + android:name + ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:9:18-73 +uses-permission#android.permission.WRITE_EXTERNAL_STORAGE +ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:10:1-77 + android:name + ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:10:18-74 +uses-permission#android.permission.ACCESS_NETWORK_STATE +ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:11:1-75 + android:name + ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:11:18-72 +uses-permission#android.permission.ACCESS_WIFI_STATE +ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:12:1-72 + android:name + ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:12:18-69 +uses-permission#android.permission.BROADCAST_STICKY +ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:13:1-71 + android:name + ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:13:18-68 +uses-permission#android.permission.CAMERA +ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:14:1-61 + android:name + ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:14:18-58 +uses-permission#android.permission.CHANGE_NETWORK_STATE +ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:15:1-75 + android:name + ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:15:18-72 +uses-permission#android.permission.CHANGE_WIFI_STATE +ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:16:1-72 + android:name + ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:16:18-69 application -ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:10:3-22:17 +ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:18:1-29:15 android:label - ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:14:7-39 - android:fullBackupContent - ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:12:7-40 + ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:21:1-33 android:allowBackup - ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:11:7-34 + ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:19:1-28 android:icon - ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:13:7-41 + ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:20:1-35 activity#com.example.nativecodec.NativeCodec -ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:15:5-21:16 +ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:22:1-28:12 android:label - ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:16:15-47 + ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:23:1-33 android:name - ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:15:15-42 + ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:22:11-38 intent-filter#android.intent.action.MAIN+android.intent.category.LAUNCHER -ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:17:7-20:23 +ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:24:1-27:17 action#android.intent.action.MAIN -ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:18:9-61 +ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:25:1-53 android:name - ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:18:17-58 + ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:25:9-50 category#android.intent.category.LAUNCHER -ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:19:9-69 +ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:26:1-61 android:name - ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:19:19-66 + ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:26:11-58 uses-sdk INJECTED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml reason: use-sdk injection requested android:targetSdkVersion -- Gitblit v1.8.0