ReVanced-Mirror/Apktool
1
0
Fork 0
mirror of https://github.com/revanced/Apktool.git synced 2025-01-08 11:05:52 +01:00
Code Issues Projects Releases Wiki Activity

Changed default name of built apk from out.apk to a name of original apk.

Browse Source
This commit is contained in:
Ryszard Wiśniewski 2010-06-12 17:56:19 +02:00
parent 517877c665
commit 0ea7744625
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/brut/androlib/Androlib.java
View File

@ -153,12 +153,16 @@ public class Androlib {
Object t1 = meta.get("isFrameworkApk"); Object t1 = meta.get("isFrameworkApk");
boolean framework = t1 == null ? false : (Boolean) t1; boolean framework = t1 == null ? false : (Boolean) t1;
String outFileName = (String) meta.get("apkFileName");
File outFile = new File(appDir, "dist" + File.separator +
(outFileName == null ? "out" : outFileName));
new File(appDir, APK_DIRNAME).mkdirs(); new File(appDir, APK_DIRNAME).mkdirs();
buildSources(appDir, forceBuildAll, debug); buildSources(appDir, forceBuildAll, debug);
buildResources(appDir, forceBuildAll, framework, buildResources(appDir, forceBuildAll, framework,
(Map<String, Object>) meta.get("usesFramework")); (Map<String, Object>) meta.get("usesFramework"));
buildLib(appDir, forceBuildAll); buildLib(appDir, forceBuildAll);
buildApk(appDir, framework); buildApk(appDir, outFile, framework);
} }
public void buildSources(File appDir, boolean forceBuildAll, boolean debug) public void buildSources(File appDir, boolean forceBuildAll, boolean debug)
@ -324,10 +328,9 @@ public class Androlib {
} }
} }
public void buildApk(File appDir, boolean framework) public void buildApk(File appDir, File outApk, boolean framework)
throws AndrolibException { throws AndrolibException {
LOGGER.info("Building apk file..."); LOGGER.info("Building apk file...");
File outApk = new File(appDir, OUT_APK_FILENAME);
if (outApk.exists()) { if (outApk.exists()) {
outApk.delete(); outApk.delete();
} else { } else {
@ -418,7 +421,6 @@ public class Androlib {
private final static String SMALI_DIRNAME = "smali"; private final static String SMALI_DIRNAME = "smali";
private final static String APK_DIRNAME = "build/apk"; private final static String APK_DIRNAME = "build/apk";
private final static String OUT_APK_FILENAME = "dist/out.apk";
private final static String[] APK_RESOURCES_FILENAMES = private final static String[] APK_RESOURCES_FILENAMES =
new String[]{"resources.arsc", "AndroidManifest.xml", "res"}; new String[]{"resources.arsc", "AndroidManifest.xml", "res"};
private final static String[] APK_RESOURCES_WITHOUT_RES_FILENAMES = private final static String[] APK_RESOURCES_WITHOUT_RES_FILENAMES =

1
src/brut/androlib/ApkDecoder.java
View File

@ -174,6 +174,7 @@ public class ApkDecoder {
private void writeMetaFile() throws AndrolibException { private void writeMetaFile() throws AndrolibException {
Map<String, Object> meta = new LinkedHashMap<String, Object>(); Map<String, Object> meta = new LinkedHashMap<String, Object>();
meta.put("version", Androlib.getVersion()); meta.put("version", Androlib.getVersion());
meta.put("apkFileName", mApkFile.getName());
if (hasResources()) { if (hasResources()) {
meta.put("isFrameworkApk", meta.put("isFrameworkApk",