Make ApkBuilder create filenames supported by older rules.
'ant install' must know the debug apk filename so newer naming scheme breaks
on older rule files (1.5 and earlier).
The fix is to check for the presence of the property naming the debug,
signed, unaligned package. If the property is present, then we use
the new naming scheme ({base}[-{config}]-debug-unaligned.apk), else we use
the old one ({base}-[-{config}]-debug.apk).
Also merge the install/reinstall targets, since 'adb install -r <file>'
works even if the apk was not yet installed.
Change-Id: Id0670610a6539a3f48c955756955f950039c3cd0
diff --git a/anttasks/src/com/android/ant/ApkBuilderTask.java b/anttasks/src/com/android/ant/ApkBuilderTask.java
index b2c445d..e062fed 100644
--- a/anttasks/src/com/android/ant/ApkBuilderTask.java
+++ b/anttasks/src/com/android/ant/ApkBuilderTask.java
@@ -205,8 +205,26 @@
// for reuse by other targets (signing/zipaligning)
Path path = new Path(antProject);
+ // The createApk method uses mBaseName for the base name of the packages (resources
+ // and apk files).
+ // The generated apk file name is
+ // debug: {base}[-{config}]-debug-unaligned.apk
+ // release: {base}[-{config}]-unsigned.apk
+ // Unfortunately for 1.5 projects and before the 'install' ant target expects the name
+ // of the default debug package to be {base}-debug.apk
+ // In order to support those package, we look for the 'out-debug-unaligned-package'
+ // property. If this exist, then we generate {base}[-{config}]-debug-unaligned.apk
+ // otherwise we generate {base}[-{config}]-debug.apk
+ // FIXME: Make apkbuilder export the package name used instead of
+ // having to keep apkbuilder and the rules file in sync
+ String debugPackageSuffix = "-debug-unaligned.apk";
+ if (antProject.getProperty("out-debug-unaligned-package") == null) {
+ debugPackageSuffix = "-debug.apk";
+ }
+
// first do a full resource package
- createApk(apkBuilder, null /*configName*/, null /*resourceFilter*/, path);
+ createApk(apkBuilder, null /*configName*/, null /*resourceFilter*/, path,
+ debugPackageSuffix);
// now see if we need to create file with filtered resources.
// Get the project base directory.
@@ -219,7 +237,8 @@
Map<String, String> apkFilters = apkSettings.getResourceFilters();
if (apkFilters.size() > 0) {
for (Entry<String, String> entry : apkFilters.entrySet()) {
- createApk(apkBuilder, entry.getKey(), entry.getValue(), path);
+ createApk(apkBuilder, entry.getKey(), entry.getValue(), path,
+ debugPackageSuffix);
}
}
}
@@ -244,11 +263,12 @@
* @param resourceFilter the resource configuration filter to pass to aapt (if configName is
* non null)
* @param path Ant {@link Path} to which add the generated APKs as {@link PathElement}
+ * @param debugPackageSuffix suffix for the debug packages.
* @throws FileNotFoundException
* @throws ApkCreationException
*/
private void createApk(ApkBuilderImpl apkBuilder, String configName, String resourceFilter,
- Path path)
+ Path path, String debugPackageSuffix)
throws FileNotFoundException, ApkCreationException {
// All the files to be included in the archive have already been prep'ed up, except
// the resource package.
@@ -274,7 +294,7 @@
}
if (mSigned) {
- filename = filename + "-debug-unaligned.apk";
+ filename = filename + debugPackageSuffix;
} else {
filename = filename + "-unsigned.apk";
}
diff --git a/eclipse/changes.txt b/eclipse/changes.txt
index cd2736a..5805681 100644
--- a/eclipse/changes.txt
+++ b/eclipse/changes.txt
@@ -1,7 +1,8 @@
-0.9.2:
+0.9.3:
- New wizard to create Android JUnit Test Projects.
- New AVD wizard.
- SDK Updater
+- zipalign support
0.9.1:
- Added an AVD creation wizard to ADT. It is automatically displayed during a launch if no compatible AVDs are found.
diff --git a/scripts/android_rules.xml b/scripts/android_rules.xml
index 4a98700..64f0e39 100644
--- a/scripts/android_rules.xml
+++ b/scripts/android_rules.xml
@@ -235,15 +235,7 @@
<!-- Installs the package on the default emulator/device -->
<target name="install" depends="debug"
- description="Installs the debug package onto a running emulator or device. This can only be used if the application has not yet been installed.">
- <echo>Installing ${out.debug.package} onto default emulator or device...</echo>
- <exec executable="${adb}" failonerror="true">
- <arg value="install" />
- <arg path="${out.debug.package}" />
- </exec>
- </target>
-
- <target name="reinstall" depends="debug" description="Installs the debug package on a running emulator or device that already has the application.">
+ description="Installs/reinstalls the debug package onto a running emulator or device. This can only be used if the application has not yet been installed.">
<echo>Installing ${out.debug.package} onto default emulator or device...</echo>
<exec executable="${adb}" failonerror="true">
<arg value="install" />
@@ -286,12 +278,10 @@
<echo> debug: Builds the application and signs it with a debug key.</echo>
<echo> release: Builds the application. The generated apk file must be</echo>
<echo> signed before it is published.</echo>
- <echo> install: Installs the debug package onto a running emulator or</echo>
- <echo> device. This can only be used if the application has</echo>
- <echo> not yet been installed.</echo>
- <echo> reinstall: Installs the debug package on a running emulator or</echo>
- <echo> device that already has the application.</echo>
- <echo> The signatures must match.</echo>
+ <echo> install: Installs/reinstall the debug package onto a running</echo>
+ <echo> emulator or device.</echo>
+ <echo> If the application was previously installed, the</echo>
+ <echo> signatures must match.</echo>
<echo> uninstall: Uninstalls the application from a running emulator or</echo>
<echo> device.</echo>
</target>