diff options
| author | Xavier Ducrohet <xav@android.com> | 2009-08-25 20:01:56 -0700 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2009-08-26 11:17:04 -0700 |
| commit | aa1abe879a53e1d25b8a95f677a920938097f3c9 (patch) | |
| tree | 87edbf7cffc024c6d566e6ee54b9235bf8226a03 /tools/scripts | |
| parent | 04680858a0671ad615f088edeea87b61ea243f24 (diff) | |
| download | android_development-aa1abe879a53e1d25b8a95f677a920938097f3c9.tar.gz android_development-aa1abe879a53e1d25b8a95f677a920938097f3c9.tar.bz2 android_development-aa1abe879a53e1d25b8a95f677a920938097f3c9.zip | |
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.
DO NOT MERGE
Diffstat (limited to 'tools/scripts')
| -rw-r--r-- | tools/scripts/android_rules.xml | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/tools/scripts/android_rules.xml b/tools/scripts/android_rules.xml index de44a7e6e..ad36cbe72 100644 --- a/tools/scripts/android_rules.xml +++ b/tools/scripts/android_rules.xml @@ -240,14 +240,6 @@ <echo>Installing ${out-debug-package} onto default emulator...</echo> <exec executable="${adb}" failonerror="true"> <arg value="install" /> - <arg path="${out-debug-package}" /> - </exec> - </target> - - <target name="reinstall" depends="debug"> - <echo>Installing ${out-debug-package} onto default emulator...</echo> - <exec executable="${adb}" failonerror="true"> - <arg value="install" /> <arg value="-r" /> <arg path="${out-debug-package}" /> </exec> @@ -278,12 +270,10 @@ <echo> debug: Builds the application and sign 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: uninstall the application from a running emulator or</echo> <echo> device.</echo> </target> |