|
@@ -754,7 +754,7 @@ def generateNewRFile(game, sdk, subChannel, config):
|
|
|
outApk = os.path.join(compliePath, 'res.apk')
|
|
|
linkResCmd = '"%s" link -o "%s" -I "%s" --manifest "%s" --java "%s" --auto-add-overlay' % (aapt, outApk, androidPlatforms, manifest, compliePath)
|
|
|
for filename in os.listdir(unzipResPath):
|
|
|
- linkResCmd += ' -R "%s"' % filename
|
|
|
+ linkResCmd += ' %s' % filename
|
|
|
ret = file_utils.execFormatCmd(linkResCmd, unzipResPath)
|
|
|
if ret:
|
|
|
return ret
|
|
@@ -764,7 +764,7 @@ def generateNewRFile(game, sdk, subChannel, config):
|
|
|
packageName = xml_utils.getPackageName(manifest)
|
|
|
packagePath = file_utils.getPackagePath(compliePath, packageName)
|
|
|
RSourceFile = os.path.join(packagePath, 'R.java')
|
|
|
- complieRCmd = 'javac -source 1.7 -target 1.7 -encoding UTF-8 "%s"' % RSourceFile
|
|
|
+ complieRCmd = 'javac -source 1.8 -target 1.8 -encoding UTF-8 "%s"' % RSourceFile
|
|
|
ret = file_utils.execFormatCmd(complieRCmd)
|
|
|
if ret:
|
|
|
return ret
|