From fd384ab72c1671e819298d1f0870e0940e29685c Mon Sep 17 00:00:00 2001
From: lwb <q3213421wrwqr>
Date: 星期三, 30 十二月 2020 15:15:57 +0800
Subject: [PATCH] plugin 的 清单没办法自动合并，需要手动合并
---
Channel/Android/gtgame/debug/libs/library-debug-gtgame.aar | 0
Channel/Android/gtgame/release/libs/library-release-gtgame.aar | 0
SdkProject/library/build.gradle | 8 ++------
SdkProject/channel/GTGame/java/com/secondworld/sdk/command/CmdRoleLogin.java | 0
4 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/Channel/Android/gtgame/debug/libs/library-debug-gtgame.aar b/Channel/Android/gtgame/debug/libs/library-debug-gtgame.aar
index f0341db..2ea449b 100644
--- a/Channel/Android/gtgame/debug/libs/library-debug-gtgame.aar
+++ b/Channel/Android/gtgame/debug/libs/library-debug-gtgame.aar
Binary files differ
diff --git a/Channel/Android/gtgame/release/libs/library-release-gtgame.aar b/Channel/Android/gtgame/release/libs/library-release-gtgame.aar
index 792722d..a537eaa 100644
--- a/Channel/Android/gtgame/release/libs/library-release-gtgame.aar
+++ b/Channel/Android/gtgame/release/libs/library-release-gtgame.aar
Binary files differ
diff --git a/SdkProject/channel/GTGame/java/com/secondworld/sdk/command/CmdROleLogin.java b/SdkProject/channel/GTGame/java/com/secondworld/sdk/command/CmdRoleLogin.java
similarity index 100%
rename from SdkProject/channel/GTGame/java/com/secondworld/sdk/command/CmdROleLogin.java
rename to SdkProject/channel/GTGame/java/com/secondworld/sdk/command/CmdRoleLogin.java
diff --git a/SdkProject/library/build.gradle b/SdkProject/library/build.gradle
index 09ab1a6..6fd665f 100644
--- a/SdkProject/library/build.gradle
+++ b/SdkProject/library/build.gradle
@@ -98,11 +98,7 @@
java.srcDirs "${pluginPath}/java"
jniLibs.srcDirs "${pluginPath}libs"
res.srcDirs "${pluginPath}/res"
- manifest {
- File file = file("${pluginPath}/AndroidManifest.xml")
- if (file.exists())
- srcFile "${pluginPath}/AndroidManifest.xml"
- }
+ //娓呭崟鍙兘鍚堝苟涓�涓紝鎵�鏈夋彃浠剁殑娓呭崟闇�瑕佹墜鍔ㄥ鍒跺埌瀵瑰簲鐨勬笭閬撻噷
}
}
}
@@ -147,7 +143,7 @@
//鎵ц鎵撳寘浠诲姟浠ュ強鎷疯礉鍒板閮�
task assembleAndCopySdk() {
- dependsOn 'assembleMerger'
+ dependsOn 'assemble'
dependsOn deleteSdk
dependsOn copyDebugSdk
dependsOn copyReleaseSdk
--
Gitblit v1.8.0