소스 검색

更新jmsdk
优化lib目录读取规则

yhz 5 년 전
부모
커밋
83f6f89ce7
5개의 변경된 파일22개의 추가작업 그리고 0개의 파일을 삭제
  1. 4 0
      package_utils.py
  2. 4 0
      package_utils_record.py
  3. 4 0
      package_utils_shanshen.py
  4. 10 0
      sdk/jm/libs/config.json
  5. BIN
      sdk/jm/libs/jm_sdk_20190911.jar

+ 4 - 0
package_utils.py

@@ -788,6 +788,10 @@ def packJar(game, sdk, subChannel, config):
             libList = libConf[conf]
             for jar in libList:
                 dexCmd += ' ' + os.path.join(libs, jar)
+        elif 'default' in libConf:
+            libList = libConf['default']
+            for jar in libList:
+                dexCmd += ' ' + os.path.join(libs, jar)
         else:
             for jar in os.listdir(libs):
                 if not jar.endswith('.jar'):

+ 4 - 0
package_utils_record.py

@@ -840,6 +840,10 @@ def packJar(game, sdk, subChannel, config):
             libList = libConf[conf]
             for jar in libList:
                 dexCmd += ' ' + os.path.join(libs, jar)
+        elif 'default' in libConf:
+            libList = libConf['default']
+            for jar in libList:
+                dexCmd += ' ' + os.path.join(libs, jar)
         else:
             for jar in os.listdir(libs):
                 if not jar.endswith('.jar'):

+ 4 - 0
package_utils_shanshen.py

@@ -724,6 +724,10 @@ def packJar(game, sdk, subChannel, config):
             libList = libConf[conf]
             for jar in libList:
                 dexCmd += ' ' + os.path.join(libs, jar)
+        elif 'default' in libConf:
+            libList = libConf['default']
+            for jar in libList:
+                dexCmd += ' ' + os.path.join(libs, jar)
         else:
             for jar in os.listdir(libs):
                 if not jar.endswith('.jar'):

+ 10 - 0
sdk/jm/libs/config.json

@@ -0,0 +1,10 @@
+{
+	"default":[
+		"android-support-v4.jar",
+		"commons-httpclient-3.1.jar",
+		"org.apache.http.legacy.jar",
+		"walle.jar",
+		"walle-reader-1.1.6.jar",
+		"jm_sdk_20190911.jar"
+	]
+}

BIN
sdk/jm/libs/jm_sdk_20190821.jar → sdk/jm/libs/jm_sdk_20190911.jar