From 8eea61c73626671e014d8237413f7d534f69e019 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 23 六月 2017 13:39:40 +0800
Subject: [PATCH] 

---
 VisitFace/RtspNativeCodec/app/build/outputs/logs/manifest-merger-debug-report.txt |   85 ++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 85 insertions(+), 0 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
new file mode 100644
index 0000000..8d07a2c
--- /dev/null
+++ b/VisitFace/RtspNativeCodec/app/build/outputs/logs/manifest-merger-debug-report.txt
@@ -0,0 +1,85 @@
+-- Merging decision tree log ---
+manifest
+ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:2:1-32:16
+	package
+		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:6-55
+	android:glEsVersion
+		ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:5:20-52
+uses-permission#android.permission.INTERNET
+ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:9:1-62
+	android:name
+		ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:9:18-60
+uses-permission#android.permission.READ_EXTERNAL_STORAGE
+ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:10:6-80
+	android:name
+		ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:10:23-78
+uses-permission#android.permission.WRITE_EXTERNAL_STORAGE
+ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:11:5-81
+	android:name
+		ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:11:22-78
+uses-permission#android.permission.ACCESS_NETWORK_STATE
+ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:12:5-79
+	android:name
+		ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:12:22-76
+uses-permission#android.permission.ACCESS_WIFI_STATE
+ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:13:5-76
+	android:name
+		ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:13:22-73
+uses-permission#android.permission.BROADCAST_STICKY
+ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:14:5-75
+	android:name
+		ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:14:22-72
+uses-permission#android.permission.CAMERA
+ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:15:5-65
+	android:name
+		ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:15:22-62
+uses-permission#android.permission.MEDIA_CONTENT_CONTROL
+ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:16:5-80
+	android:name
+		ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:16:22-77
+uses-permission#android.permission.CHANGE_NETWORK_STATE
+ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:17:5-79
+	android:name
+		ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:17:22-76
+uses-permission#android.permission.CHANGE_WIFI_STATE
+ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:18:5-76
+	android:name
+		ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:18:22-73
+application
+ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:20:5-31:19
+	android:label
+		ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:23:5-37
+	android:allowBackup
+		ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:21:5-32
+	android:icon
+		ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:22:5-39
+activity#com.example.nativecodec.NativeCodec
+ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:24:5-30:16
+	android:label
+		ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:25:5-37
+	android:name
+		ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:24:15-42
+intent-filter#android.intent.action.MAIN+android.intent.category.LAUNCHER
+ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:26:5-29:21
+action#android.intent.action.MAIN
+ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:27:5-57
+	android:name
+		ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:27:13-54
+category#android.intent.category.LAUNCHER
+ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:28:5-65
+	android:name
+		ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:28:15-62
+uses-sdk
+INJECTED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml reason: use-sdk injection requested
+	android:targetSdkVersion
+		INJECTED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml
+		INJECTED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml
+	android:minSdkVersion
+		INJECTED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml
+		INJECTED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml

--
Gitblit v1.8.0