LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge change 23515 into eclair

Browse Source 
* changes:
  Update apkbuilder to support new property names
This commit is contained in:
Android (Google) Code Review
2009-09-01 15:52:35 -07:00
parent 6ef45eb862 4280da6d70
commit 56098693d2
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/anttasks/src/com/android/ant/ApkBuilderTask.java
View File

@@ -212,13 +212,14 @@ public class ApkBuilderTask extends Task {
// release: {base}[-{config}]-unsigned.apk // release: {base}[-{config}]-unsigned.apk
// Unfortunately for 1.5 projects and before the 'install' ant target expects the name // Unfortunately for 1.5 projects and before the 'install' ant target expects the name
// of the default debug package to be {base}-debug.apk // 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 // property. If this exist, then we generate {base}[-{config}]-debug-unaligned.apk
// otherwise we generate {base}[-{config}]-debug.apk // otherwise we generate {base}[-{config}]-debug.apk
// FIXME: Make apkbuilder export the package name used instead of // FIXME: Make apkbuilder export the package name used instead of
// having to keep apkbuilder and the rules file in sync // having to keep apkbuilder and the rules file in sync
String debugPackageSuffix = "-debug-unaligned.apk"; 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"; debugPackageSuffix = "-debug.apk";
} }