Merge branch 'qa_1.1.5_1' into qa_1.1.5_2
# Conflicts: # libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt # libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainServiceController.kt # libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/AnalyticsUtil.kt
This commit is contained in:
@@ -0,0 +1,18 @@
|
||||
package com.alibaba.android.arouter.routes;
|
||||
|
||||
import com.alibaba.android.arouter.facade.enums.RouteType;
|
||||
import com.alibaba.android.arouter.facade.model.RouteMeta;
|
||||
import com.alibaba.android.arouter.facade.template.IRouteGroup;
|
||||
import com.mogo.test.crashreport.bugly.BuglyCrashReportProvider;
|
||||
import java.lang.Override;
|
||||
import java.lang.String;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* DO NOT EDIT THIS FILE!!! IT WAS GENERATED BY AROUTER. */
|
||||
public class ARouter$$Group$$crashreport implements IRouteGroup {
|
||||
@Override
|
||||
public void loadInto(Map<String, RouteMeta> atlas) {
|
||||
atlas.put("/crashreport/api", RouteMeta.build(RouteType.PROVIDER, BuglyCrashReportProvider.class, "/crashreport/api", "crashreport", null, -1, -2147483648));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
package com.alibaba.android.arouter.routes;
|
||||
|
||||
import com.alibaba.android.arouter.facade.enums.RouteType;
|
||||
import com.alibaba.android.arouter.facade.model.RouteMeta;
|
||||
import com.alibaba.android.arouter.facade.template.IProviderGroup;
|
||||
import com.mogo.test.crashreport.bugly.BuglyCrashReportProvider;
|
||||
import java.lang.Override;
|
||||
import java.lang.String;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* DO NOT EDIT THIS FILE!!! IT WAS GENERATED BY AROUTER. */
|
||||
public class ARouter$$Providers$$crashreportbugly implements IProviderGroup {
|
||||
@Override
|
||||
public void loadInto(Map<String, RouteMeta> providers) {
|
||||
providers.put("com.mogo.test.crashreport.ITestCrashReportProvider", RouteMeta.build(RouteType.PROVIDER, BuglyCrashReportProvider.class, "/crashreport/api", "crashreport", null, -1, -2147483648));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
package com.alibaba.android.arouter.routes;
|
||||
|
||||
import com.alibaba.android.arouter.facade.template.IRouteGroup;
|
||||
import com.alibaba.android.arouter.facade.template.IRouteRoot;
|
||||
import java.lang.Class;
|
||||
import java.lang.Override;
|
||||
import java.lang.String;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* DO NOT EDIT THIS FILE!!! IT WAS GENERATED BY AROUTER. */
|
||||
public class ARouter$$Root$$crashreportbugly implements IRouteRoot {
|
||||
@Override
|
||||
public void loadInto(Map<String, Class<? extends IRouteGroup>> routes) {
|
||||
routes.put("crashreport", ARouter$$Group$$crashreport.class);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
/**
|
||||
* Automatically generated file. DO NOT MODIFY
|
||||
*/
|
||||
package com.mogo.test.crashreport.bugly;
|
||||
|
||||
public final class BuildConfig {
|
||||
public static final boolean DEBUG = Boolean.parseBoolean("true");
|
||||
public static final String LIBRARY_PACKAGE_NAME = "com.mogo.test.crashreport.bugly";
|
||||
/**
|
||||
* @deprecated APPLICATION_ID is misleading in libraries. For the library package name use LIBRARY_PACKAGE_NAME
|
||||
*/
|
||||
@Deprecated
|
||||
public static final String APPLICATION_ID = "com.mogo.test.crashreport.bugly";
|
||||
public static final String BUILD_TYPE = "debug";
|
||||
public static final String FLAVOR = "";
|
||||
public static final int VERSION_CODE = 1;
|
||||
public static final String VERSION_NAME = "1.0.0";
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.mogo.test.crashreport.bugly"
|
||||
android:versionCode="1"
|
||||
android:versionName="1.0.0" >
|
||||
|
||||
<uses-sdk
|
||||
android:minSdkVersion="19"
|
||||
android:targetSdkVersion="22" />
|
||||
/
|
||||
|
||||
</manifest>
|
||||
@@ -0,0 +1 @@
|
||||
[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0.0","enabled":true,"outputFile":"crashreport-bugly-debug.aar","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.mogo.test.crashreport.bugly","split":""}}]
|
||||
@@ -0,0 +1 @@
|
||||
{"jetified-arouter-compiler-1.2.2.jar (com.alibaba:arouter-compiler:1.2.2)":false,"auto-service-1.0-rc2.jar (com.google.auto.service:auto-service:1.0-rc2)":false}
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\debug\jniLibs"/></dataSet></merger>
|
||||
@@ -0,0 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\debug\shaders"/></dataSet></merger>
|
||||
@@ -0,0 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\assets"/><source path="D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\build\intermediates\shader_assets\debug\compileDebugShaders\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\debug\assets"/></dataSet></merger>
|
||||
@@ -0,0 +1 @@
|
||||
#Fri Sep 11 11:34:40 CST 2020
|
||||
@@ -0,0 +1,2 @@
|
||||
<?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:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\res"/><source path="D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\build\generated\res\rs\debug"/><source path="D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\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:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\res"/><source path="D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\build\generated\res\rs\debug"/><source path="D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\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:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\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:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\debug\res"/></dataSet><mergedItems/></merger>
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.mogo.test.crashreport.bugly"
|
||||
android:versionCode="1"
|
||||
android:versionName="1.0.0" >
|
||||
|
||||
<uses-sdk
|
||||
android:minSdkVersion="19"
|
||||
android:targetSdkVersion="22" />
|
||||
/
|
||||
|
||||
</manifest>
|
||||
@@ -0,0 +1,2 @@
|
||||
R_DEF: Internal format may change without notice
|
||||
local
|
||||
@@ -0,0 +1,14 @@
|
||||
1<?xml version="1.0" encoding="utf-8"?>
|
||||
2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
3 package="com.mogo.test.crashreport.bugly"
|
||||
4 android:versionCode="1"
|
||||
5 android:versionName="1.0.0" >
|
||||
6
|
||||
7 <uses-sdk
|
||||
8 android:minSdkVersion="19"
|
||||
8-->D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml
|
||||
9 android:targetSdkVersion="22" />
|
||||
9-->D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml
|
||||
10 /
|
||||
11
|
||||
12</manifest>
|
||||
@@ -0,0 +1 @@
|
||||
[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0.0","enabled":true,"outputFile":"crashreport-bugly-debug.aar","fullName":"debug","baseName":"debug"},"path":"..\\..\\library_manifest\\debug\\AndroidManifest.xml","properties":{"packageId":"com.mogo.test.crashreport.bugly","split":""}}]
|
||||
File diff suppressed because it is too large
Load Diff
Binary file not shown.
1768
test/crashreport-bugly/build/intermediates/symbols/debug/R.txt
Normal file
1768
test/crashreport-bugly/build/intermediates/symbols/debug/R.txt
Normal file
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,37 @@
|
||||
-- Merging decision tree log ---
|
||||
manifest
|
||||
ADDED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml:1:1-5:12
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml:1:1-5:12
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml:1:1-5:12
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml:1:1-5:12
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml:1:1-5:12
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml:1:1-5:12
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml:1:1-5:12
|
||||
package
|
||||
ADDED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml:2:5-46
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml
|
||||
android:versionName
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml
|
||||
ADDED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml:1:1-5:12
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml
|
||||
android:versionCode
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml
|
||||
ADDED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml:1:1-5:12
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml
|
||||
xmlns:android
|
||||
ADDED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml:1:11-69
|
||||
uses-sdk
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml reason: use-sdk injection requested
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml
|
||||
android:targetSdkVersion
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml
|
||||
ADDED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml
|
||||
android:minSdkVersion
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml
|
||||
ADDED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml
|
||||
@@ -0,0 +1,18 @@
|
||||
/**
|
||||
* Automatically generated file. DO NOT MODIFY
|
||||
*/
|
||||
package com.mogo.test.crashreport;
|
||||
|
||||
public final class BuildConfig {
|
||||
public static final boolean DEBUG = Boolean.parseBoolean("true");
|
||||
public static final String LIBRARY_PACKAGE_NAME = "com.mogo.test.crashreport";
|
||||
/**
|
||||
* @deprecated APPLICATION_ID is misleading in libraries. For the library package name use LIBRARY_PACKAGE_NAME
|
||||
*/
|
||||
@Deprecated
|
||||
public static final String APPLICATION_ID = "com.mogo.test.crashreport";
|
||||
public static final String BUILD_TYPE = "debug";
|
||||
public static final String FLAVOR = "";
|
||||
public static final int VERSION_CODE = 1;
|
||||
public static final String VERSION_NAME = "1.0.0";
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.mogo.test.crashreport"
|
||||
android:versionCode="1"
|
||||
android:versionName="1.0.0" >
|
||||
|
||||
<uses-sdk
|
||||
android:minSdkVersion="19"
|
||||
android:targetSdkVersion="22" />
|
||||
/
|
||||
|
||||
</manifest>
|
||||
@@ -0,0 +1 @@
|
||||
[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0.0","enabled":true,"outputFile":"crashreport-debug.aar","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.mogo.test.crashreport","split":""}}]
|
||||
@@ -0,0 +1 @@
|
||||
{"jetified-arouter-compiler-1.2.2.jar (com.alibaba:arouter-compiler:1.2.2)":false,"auto-service-1.0-rc2.jar (com.google.auto.service:auto-service:1.0-rc2)":false}
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\test\crashreport\src\debug\jniLibs"/></dataSet></merger>
|
||||
@@ -0,0 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\test\crashreport\src\debug\shaders"/></dataSet></merger>
|
||||
@@ -0,0 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\assets"/><source path="D:\work\Launcher_os_2\Launcher\test\crashreport\build\intermediates\shader_assets\debug\compileDebugShaders\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\test\crashreport\src\debug\assets"/></dataSet></merger>
|
||||
@@ -0,0 +1 @@
|
||||
#Fri Sep 11 11:34:40 CST 2020
|
||||
@@ -0,0 +1,2 @@
|
||||
<?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:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\res"/><source path="D:\work\Launcher_os_2\Launcher\test\crashreport\build\generated\res\rs\debug"/><source path="D:\work\Launcher_os_2\Launcher\test\crashreport\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:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\res"/><source path="D:\work\Launcher_os_2\Launcher\test\crashreport\build\generated\res\rs\debug"/><source path="D:\work\Launcher_os_2\Launcher\test\crashreport\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:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\test\crashreport\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:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\test\crashreport\src\debug\res"/></dataSet><mergedItems/></merger>
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.mogo.test.crashreport"
|
||||
android:versionCode="1"
|
||||
android:versionName="1.0.0" >
|
||||
|
||||
<uses-sdk
|
||||
android:minSdkVersion="19"
|
||||
android:targetSdkVersion="22" />
|
||||
/
|
||||
|
||||
</manifest>
|
||||
@@ -0,0 +1,2 @@
|
||||
R_DEF: Internal format may change without notice
|
||||
local
|
||||
@@ -0,0 +1,14 @@
|
||||
1<?xml version="1.0" encoding="utf-8"?>
|
||||
2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
3 package="com.mogo.test.crashreport"
|
||||
4 android:versionCode="1"
|
||||
5 android:versionName="1.0.0" >
|
||||
6
|
||||
7 <uses-sdk
|
||||
8 android:minSdkVersion="19"
|
||||
8-->D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml
|
||||
9 android:targetSdkVersion="22" />
|
||||
9-->D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml
|
||||
10 /
|
||||
11
|
||||
12</manifest>
|
||||
@@ -0,0 +1 @@
|
||||
[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0.0","enabled":true,"outputFile":"crashreport-debug.aar","fullName":"debug","baseName":"debug"},"path":"..\\..\\library_manifest\\debug\\AndroidManifest.xml","properties":{"packageId":"com.mogo.test.crashreport","split":""}}]
|
||||
File diff suppressed because it is too large
Load Diff
Binary file not shown.
1768
test/crashreport/build/intermediates/symbols/debug/R.txt
Normal file
1768
test/crashreport/build/intermediates/symbols/debug/R.txt
Normal file
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,37 @@
|
||||
-- Merging decision tree log ---
|
||||
manifest
|
||||
ADDED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml:1:1-5:12
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml:1:1-5:12
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml:1:1-5:12
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml:1:1-5:12
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml:1:1-5:12
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml:1:1-5:12
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml:1:1-5:12
|
||||
package
|
||||
ADDED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml:2:5-40
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml
|
||||
android:versionName
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml
|
||||
ADDED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml:1:1-5:12
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml
|
||||
android:versionCode
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml
|
||||
ADDED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml:1:1-5:12
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml
|
||||
xmlns:android
|
||||
ADDED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml:1:11-69
|
||||
uses-sdk
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml reason: use-sdk injection requested
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml
|
||||
android:targetSdkVersion
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml
|
||||
ADDED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml
|
||||
android:minSdkVersion
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml
|
||||
ADDED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml
|
||||
Reference in New Issue
Block a user