From 4280da6d70c2e1b40b6d8187d366ab12ebd9dee4 Mon Sep 17 00:00:00 2001 From: Piotr Gurgul Date: Tue, 1 Sep 2009 14:50:43 -0700 Subject: [PATCH] Update apkbuilder to support new property names out.debug.unaligned.package property name has not been updated in ApkBuilderTask.java and that is why ApkBuilder misbehaved BUG: 2090896 --- tools/anttasks/src/com/android/ant/ApkBuilderTask.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/anttasks/src/com/android/ant/ApkBuilderTask.java b/tools/anttasks/src/com/android/ant/ApkBuilderTask.java index e062fedeb..18a019158 100644 --- a/tools/anttasks/src/com/android/ant/ApkBuilderTask.java +++ b/tools/anttasks/src/com/android/ant/ApkBuilderTask.java @@ -212,13 +212,14 @@ public class ApkBuilderTask extends Task { // 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' + // 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) { + if (antProject.getProperty("out.debug.unaligned.package") == null + && antProject.getProperty("out-debug-unaligned-package") == null) { debugPackageSuffix = "-debug.apk"; }