'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
'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
android-tools change to android.tools.dir
sdk-folder to sdk.dir
resource-dir to resource.dir
out-package to out.package
Some minor style changes introduced.
application-package to application.package
sdk-location to sdk.dir
android-jar to android.jar
android-aidl to android.aidl
in order to make their names compliant with the ant standards and rest
of the property names.
Properties names in alias rules deliberately ommited in this CL.
Some minor style changes introduced.
This is a new CL because of merge conflict in the old one.
Naming changed to 'property.name' style for property names.
Property 'value' attributes changed to 'location' for props containing location.
Suffix '.dir' added to properties' names indicating directories.
'-description' prefix added to intermediate/internal targets.
'*.location' properties removed, as 'location' attribute should take care of
full paths, adding $basedir implicitly, so hopefully there is no need to
define them explicitly.
External property names (taken from other files or hardcoded somewhere)
stayed untouched in this CL.
Some minor improvements to comments in order to make them more consistent.
Merge commit 'e95a86cfec18836ddbff149690a13766bfc9ada3' into eclair
* commit 'e95a86cfec18836ddbff149690a13766bfc9ada3':
Fix target for ApiDemos (API is now 4)
