OSDN Git Service
Xavier Ducrohet [Wed, 9 Jun 2010 00:16:19 +0000 (02:16 +0200)]
Fix some handling of decimal values in the UI to handle non-en locales.
Change-Id: I3f0a7e1152b8c29d02b57c41a80d431ff99e6c2b
Xavier Ducrohet [Tue, 8 Jun 2010 23:34:19 +0000 (01:34 +0200)]
Properly handle float/double in loc control when locale is not en.
String.format uses the decimal point of the current locale which
we don't want since we pass the result to the emulator which expects
decimal point to be '.'
Double.parseDouble does not use the current locale and therefore
failed to read values put in the UI that used a decimal point
that is not '.'
Also simplified the GPS command to use geo fix instead of geo nmea
Change-Id: I275018e6a967c3d4fa37f25a149a840350e40bb8
Xavier Ducrohet [Tue, 8 Jun 2010 21:43:07 +0000 (14:43 -0700)]
Merge "Enforce english formatting for the geo string sent to the emulator."
Xavier Ducrohet [Tue, 8 Jun 2010 18:44:11 +0000 (20:44 +0200)]
Enforce english formatting for the geo string sent to the emulator.
Change-Id: I1fc90e332fff41e40d2fce740bce8e07d88586ce
Xavier Ducrohet [Fri, 4 Jun 2010 19:53:07 +0000 (12:53 -0700)]
Export project creation.
Change-Id: I22b5a1c7225425b387e1fd5b6769b5e9249b7c88
David Turner [Mon, 7 Jun 2010 22:32:03 +0000 (15:32 -0700)]
Merge "qemu-props: Signal end of property list."
Xavier Ducrohet [Mon, 7 Jun 2010 21:55:00 +0000 (14:55 -0700)]
Merge "Stop using java.ext.dirs to modify classpath for android.bat"
Dries Harnie [Mon, 7 Jun 2010 21:41:00 +0000 (23:41 +0200)]
qemu-props: Signal end of property list.
Change-Id: I16f8c8b370f42c6229b3deabd66d2aaabd0b7937
Xavier Ducrohet [Mon, 7 Jun 2010 20:36:51 +0000 (13:36 -0700)]
Stop using java.ext.dirs to modify classpath for android.bat
If the original value of java.ext.dirs contains space, then the
value is lost and we lose access to optional crypto packages.
The new mechanism uses a mix of -classpath (for main package
and swt whose path is computed automatically). For other
dependencies, we use the Class-Path attribute in the manifest
of sdkmanager.jar.
Change-Id: I06c46eb1abcd9b5bab6360d1430c0dcbc97f73ce
Raphael Moll [Sat, 5 Jun 2010 05:44:38 +0000 (22:44 -0700)]
ADT GLE2: Restore relative position of elements in AbsoluteLayout drop.
Change the IDragElement to not carry the original INode, since
this is not available when crossing Eclipse instances. Instead
encode the info we need in the transfer.
Change-Id: I90a1e71171af61e51e8aaded31e05300fa85c014
Raphael Moll [Fri, 4 Jun 2010 22:34:24 +0000 (15:34 -0700)]
ADT GLE2: remove source elements after a drag'n'drop MOVE operation.
Change-Id: Ic0560466a3ccfb3a5eeb077b1eae508828870629
Raphael Moll [Fri, 4 Jun 2010 21:41:09 +0000 (14:41 -0700)]
Merge "ADT GLE2: Tests for SimpleElement/Attribute"
Raphael Moll [Fri, 4 Jun 2010 20:44:07 +0000 (13:44 -0700)]
ADT GLE2: Tests for SimpleElement/Attribute
Change-Id: Ica08b71b4d3280fefad2388780849d307a515d5a
Xavier Ducrohet [Fri, 4 Jun 2010 20:24:35 +0000 (13:24 -0700)]
Detect conflict due to change in number/list of ABI being exported.
A change in ABI (number, or one replacing another) in the ABIs of a project
would trigger a change in the generated build info, so we force
increment of versionCode in this case.
Also now display the actual project property that changed and is
causing a conflict for better troubleshooting.
Change-Id: Ibb654022f1bed0e81fa0c6e649dc69dd98f2f9e0
Xavier Ducrohet [Fri, 4 Jun 2010 18:11:28 +0000 (11:11 -0700)]
Merge "Rework the multi-apk log file(s)."
Xavier Ducrohet [Fri, 4 Jun 2010 02:50:37 +0000 (19:50 -0700)]
Rework the multi-apk log file(s).
Move away from a single log file used for:
- tell the dev what file was created with that properties
- used to increment minor versionCode for specific apks
- used to detect config change from what export to another.
There are now three files for each case, with the last two
using a never changing filename. Only a new build log file
is created at each export.
Change-Id: Ia9b464e6ffefe24463a537ee48d0a20a7a004af7
Raphael Moll [Fri, 4 Jun 2010 15:59:43 +0000 (08:59 -0700)]
Merge "ADT GLE2: Generate items on drop in AbsoluteLayout."
Raphael Moll [Thu, 3 Jun 2010 23:59:10 +0000 (16:59 -0700)]
ADT GLE2: Generate items on drop in AbsoluteLayout.
Change-Id: Iaf943b476db553cd39f5c3ee4f9c47ad3cdc6246
Xavier Ducrohet [Wed, 2 Jun 2010 22:51:19 +0000 (15:51 -0700)]
Add support for locale filters in multi-apk export.
Change-Id: Ia3faf7a6818de0e579cf491b139a41f4d379935e
Xavier Ducrohet [Wed, 2 Jun 2010 22:36:47 +0000 (15:36 -0700)]
Merge "Fix ABI ordering for the multi-apk build info."
Xavier Ducrohet [Wed, 2 Jun 2010 22:36:42 +0000 (15:36 -0700)]
Merge "Add support for soft properties in multi-apk export."
Xavier Ducrohet [Wed, 2 Jun 2010 21:46:22 +0000 (14:46 -0700)]
Merge "Implement mechanics for supports-screens in the multi-apk export."
Xavier Ducrohet [Wed, 2 Jun 2010 20:18:49 +0000 (13:18 -0700)]
Fix ABI ordering for the multi-apk build info.
Change-Id: I3241ec881549218f4cb21ce723c257ee69b9f8a5
Xavier Ducrohet [Wed, 2 Jun 2010 00:00:00 +0000 (17:00 -0700)]
Add support for soft properties in multi-apk export.
First property is split by density.
Change-Id: If68bc520ba4014bbd4b144e71d54bc1161a56e2d
Raphael Moll [Tue, 1 Jun 2010 17:25:38 +0000 (10:25 -0700)]
ADT GLE2: Script for AbsoluteLayout for new canvas drag API.
Most of the changes concern the supporting API (INode and co)
to be able to recreate and mofiy the XML elements.
Change-Id: I9ab62b3fe125faed1b647f1735f8ff0afd33a5d9
Xavier Ducrohet [Fri, 28 May 2010 22:07:52 +0000 (15:07 -0700)]
Implement mechanics for supports-screens in the multi-apk export.
- detect overlap (apk1 is small, large; apk2 is normal)
- detect non-strictly different supports-screens
- compareTo orders based on support for higher size.
Change-Id: I76251e10c83f1508c9a5b83b638a47b1c0922693
Raphael Moll [Fri, 28 May 2010 21:59:44 +0000 (14:59 -0700)]
Merge "Fix test symlinks script for windows"
Xavier Ducrohet [Fri, 28 May 2010 21:39:08 +0000 (14:39 -0700)]
Merge "Uses some constants for default values for minSdkVersion and glEsVersion"
Raphael [Fri, 28 May 2010 21:37:34 +0000 (14:37 -0700)]
Merge "ADT GLE2: Drag from canvas"
Xavier Ducrohet [Fri, 28 May 2010 19:29:45 +0000 (12:29 -0700)]
Uses some constants for default values for minSdkVersion and glEsVersion
Change-Id: Ieaf86ae56c7458e2bde90960c0262329ba77bad5
Xavier Ducrohet [Fri, 28 May 2010 20:19:25 +0000 (13:19 -0700)]
Merge "New log format for multi-apk export."
Xavier Ducrohet [Fri, 28 May 2010 19:23:49 +0000 (12:23 -0700)]
Merge "Properly compare supports-screens."
Xavier Ducrohet [Fri, 28 May 2010 19:22:48 +0000 (12:22 -0700)]
Merge "Add Manifest checks for multi-apk export."
Raphael [Thu, 25 Mar 2010 20:35:54 +0000 (13:35 -0700)]
ADT GLE2: Drag from canvas
The groovy scripts need to be changed and will be
part of the next CL (only the base view one has been
adapted here.)
Change-Id: If91602b36a3b147f6a18c9c9538d6d9bec5ecea0
Xavier Ducrohet [Fri, 28 May 2010 02:20:14 +0000 (19:20 -0700)]
New log format for multi-apk export.
Also added support for supports-screens in the log,
and fixed supports-screens parsing.
Change-Id: I702fb511eb4da0094917d7c0d9fe792f582adeb2
Xavier Ducrohet [Fri, 28 May 2010 18:04:53 +0000 (11:04 -0700)]
Merge "Add support for adb.device.arg to the test Ant rules."
Xavier Ducrohet [Fri, 28 May 2010 17:49:52 +0000 (10:49 -0700)]
Add support for adb.device.arg to the test Ant rules.
Change-Id: Idfc39bcdd79f17700952bb66ed1b67a840495011
Xavier Ducrohet [Fri, 28 May 2010 00:10:18 +0000 (17:10 -0700)]
Properly compare supports-screens.
Comparing the content of the manifest is not working. It is
important to compare the value the platform is seeing when
runnign the app, which means knowing the default values and
overriding them with what is present in the manifest.
This requires parsing targetSdkVersion as minSdkVersion is
not enough.
Change-Id: I703a8093670709e633f47170b02dec033ae29ea9
Raphael Moll [Thu, 27 May 2010 23:44:17 +0000 (16:44 -0700)]
Fix test symlinks script for windows
Change-Id: I5d9073c0c31d93005744f4309dab7c137cbeb3a0
Xavier Ducrohet [Thu, 27 May 2010 22:25:00 +0000 (15:25 -0700)]
Add Manifest checks for multi-apk export.
Change-Id: Ifd0bb892582888b7b6ef6ceb634871c1fb24d6e5
Xavier Ducrohet [Thu, 27 May 2010 19:17:50 +0000 (12:17 -0700)]
Refactored most of the multi-apk export out of the ant task into sdklib.
This common code will be used by ADT when processing multi-apk export.
I also had to improve the API for IAbstractFile/Folder.
Change-Id: Ied76f0a9f068223ceaba36124e841f804febfaf8
Xavier Ducrohet [Thu, 27 May 2010 00:13:03 +0000 (17:13 -0700)]
Move ApkData into sdklib.
This is the first step of refactoring common code from MultiApkExportTask
into sdklib.
Change-Id: Ie82eafa961a80fac7c24d3a65e75648da8af525c
Xavier Ducrohet [Tue, 25 May 2010 00:46:43 +0000 (17:46 -0700)]
Merge "Fix SD Card size check to prevent int overflow."
Xavier Ducrohet [Tue, 25 May 2010 00:27:55 +0000 (17:27 -0700)]
Fix SD Card size check to prevent int overflow.
Also added a check for sd card that are too big (>999GB) to prevent
long overflow.
Change-Id: Ie3ae57e679151dacf0e1fbbec23b29ccfdad3b6a
Xavier Ducrohet [Wed, 19 May 2010 02:12:21 +0000 (19:12 -0700)]
Add proper support for <uses-library> and <uses-feature> in the manifest parsing.
Change-Id: I80d5fd57f66005fcb4157cb6acc3f9473dd19701
Raphael Moll [Wed, 19 May 2010 05:37:12 +0000 (07:37 +0200)]
Fix error detection for invalid command line arguments.
This fixes 2 edge cases:
- when an unknown extra parameter is given (it was simply
ignored before)
e.g.: "android update sdk foo" => foo is extra.
- when a 1-argument parameter is used and no argument is actually
given but instead the next dash-parameter is found.
e.g.: "android update sdk --filter (missing value) --somearg"
Change-Id: Idc34f61728411aceaf1cf33f070ac275b3798019
Xavier Ducrohet [Wed, 19 May 2010 00:30:46 +0000 (17:30 -0700)]
Add parsing of <uses-configuration> in the manifest.
Change-Id: Id6f4b58c5a811b0b7e32b40162c8bd6680f2fc67
Raphael Moll [Tue, 18 May 2010 19:36:13 +0000 (12:36 -0700)]
Merge "Console-based "android update sdk""
Raphael Moll [Tue, 18 May 2010 19:02:31 +0000 (21:02 +0200)]
Console-based "android update sdk"
Known limitations:
- This simulate exactly what the "update sdk" GUI does,
namely it suggests the latest platform to install and
updates older packages.
- It respects the default source URLs (e.g. the getenv stuff)
- there are a few options to configure behavior such as
selecting obsolete packages and a dry-mode.
- As such, this is mostly a one-shot update step and probably
lacks configuration that a script-based updater would want.
Non-goals:
- No way to specifically request a given package to be installed.
- No way to configure the output (e.g. the install progress might
be annoying if the output is piped for a script)
SDK Bug
2404640
Change-Id: If0512558f048e88f2b216e34ed33aa550ff2610c
Xavier Ducrohet [Tue, 18 May 2010 19:23:39 +0000 (12:23 -0700)]
Update changes.txt for the SDK tools rev 7
Change-Id: I8ed3028a75011cc8218c21673308d072614baa41
Xavier Ducrohet [Tue, 18 May 2010 19:03:26 +0000 (12:03 -0700)]
Merge "move the resource enums from the qualifier classes to sdklib."
Xavier Ducrohet [Tue, 18 May 2010 00:04:26 +0000 (17:04 -0700)]
move the resource enums from the qualifier classes to sdklib.
This is so that other code (like the manifest parser) can use them.
Change-Id: I53be59bbe752e77752e90cedb528f25cf3b3792f
Raphael Moll [Tue, 18 May 2010 06:44:56 +0000 (08:44 +0200)]
Fix missing @override.
Also fixes some javadocs.
Change-Id: Ic2bc0ae1c822f184bde63b29fdc15d897661c623
Bill Napier [Mon, 17 May 2010 23:59:29 +0000 (16:59 -0700)]
Add a reboot command to IDevice to allow ddmlib users to reboot devices.
Change-Id: I8f8b792c68ec869980805c06aecf249558c6dc3f
Xavier Ducrohet [Mon, 17 May 2010 21:35:48 +0000 (14:35 -0700)]
Refactor the manifest parser test in the correct package.
And don't make it use the Parser Helper that's eclipse specific.
Also fixed the versionCode parsing (bug introduced in previous CL)
Change-Id: Ie472d7d6c4847e3fae660873cca7d71e801a2a34
Raphael Moll [Mon, 17 May 2010 12:25:57 +0000 (05:25 -0700)]
Merge "Fix collect_sources_for_sdk to collect dalvik core lib sources"
Xavier Ducrohet [Fri, 14 May 2010 22:12:35 +0000 (15:12 -0700)]
Merge "Fix a typo."
Xavier Ducrohet [Fri, 14 May 2010 22:08:13 +0000 (15:08 -0700)]
Fix a typo.
Change-Id: I699ee939436964e0c88b7b8423b5ed6fef84add1
Xavier Ducrohet [Thu, 13 May 2010 01:12:52 +0000 (18:12 -0700)]
Minor refactor, moving ManifestData out of the parser class.
Also started added new data parsing (screen support)
Change-Id: I783e973fa16598a777eec4536746e6e5b9cb3e74
Xavier Ducrohet [Thu, 13 May 2010 23:07:21 +0000 (16:07 -0700)]
Merge "Disable --library for 'update lib-project'"
Xavier Ducrohet [Thu, 13 May 2010 23:06:32 +0000 (16:06 -0700)]
Disable --library for 'update lib-project'
Change-Id: I44f612595750ff0b0248f0206456dcf2f53bcf47
Xavier Ducrohet [Thu, 13 May 2010 20:59:45 +0000 (13:59 -0700)]
Add all new source folders in a single pass in new project wizard.
Change-Id: Id54bc449a64373b4ad1cb63ec48b72076c387414
Xavier Ducrohet [Thu, 13 May 2010 01:13:36 +0000 (18:13 -0700)]
Fix the library project filter to not NPE on broken projects.
Change-Id: I51ec8f699b631171fcfa92ce8cc658ba1f50e017
Xavier Ducrohet [Wed, 12 May 2010 01:05:56 +0000 (18:05 -0700)]
Refactored the Android Manifest into sdklib.
API change to make it use IFileWrapper instead of IFile.
Old AndroidManifestParser changed to AndroidManifestHelper which
is now mostly wrapper methods to add Eclipse specific parameters.
Also moved ADT...AndroidConstants.CLASS_* to sdklib...SdkConstants
(needed by the parser) and removed AndroidConstants.FN_ANDROID_MANIFEST
since SdkConstants.FN_ANDROID_MANIFEST_XML existed too.
Moved the Eclipse implementation of IAbstractFile/Folder
Change-Id: I59bdbe90ba9a4c0b5bb2c4c68945b8877d4eed3d
Xavier Ducrohet [Wed, 12 May 2010 04:28:35 +0000 (21:28 -0700)]
Merge "Fix eclipse download link."
Xavier Ducrohet [Wed, 12 May 2010 04:22:07 +0000 (21:22 -0700)]
Fix eclipse download link.
Change-Id: I78bc8810442efb0e78a2fca8c8ddc2e83f2be83d
Xavier Ducrohet [Wed, 12 May 2010 02:39:18 +0000 (19:39 -0700)]
Merge "Add multi-apk export log."
Xavier Ducrohet [Tue, 11 May 2010 00:29:51 +0000 (17:29 -0700)]
Add multi-apk export log.
The log is used to confirm that new export do not conflict
with previous build. The build file can also be used to set
per-apk minor version code.
Change-Id: Ic5ad98758aa327f6a5bc1d00e66cf5437ac098e4
Brett Chabot [Tue, 11 May 2010 19:40:36 +0000 (12:40 -0700)]
Merge "Add Eclipse project files for ddmlib-tests."
Brett Chabot [Tue, 11 May 2010 19:35:51 +0000 (12:35 -0700)]
Add Eclipse project files for ddmlib-tests.
Change-Id: I683a47d38d9e87461d53e691c438ffeb2c3f8afa
Raphael Moll [Tue, 11 May 2010 13:37:52 +0000 (15:37 +0200)]
Fix collect_sources_for_sdk to collect dalvik core lib sources
SDK Bug
2065790
Change-Id: If818f0268e1361d58aaa2bdd7152222cf69f279a
Xavier Ducrohet [Fri, 7 May 2010 23:17:54 +0000 (16:17 -0700)]
Override local keystore/alias info when using export project to export.
Change-Id: If4f188591b8c5154be894fdd1872a182d1b6eadc
Xavier Ducrohet [Fri, 7 May 2010 21:02:42 +0000 (14:02 -0700)]
Merge "ApkBuilderTask is now more lenient with missing libs/ folders."
Xavier Ducrohet [Fri, 7 May 2010 20:49:28 +0000 (13:49 -0700)]
ApkBuilderTask is now more lenient with missing libs/ folders.
Change-Id: Ic40c35e7074a91fb40094d3c5e5a605ff1ea2fef
Xavier Ducrohet [Fri, 7 May 2010 20:05:10 +0000 (13:05 -0700)]
Merge "Fix NPE when a library does not have a libs folder."
Xavier Ducrohet [Fri, 7 May 2010 18:01:17 +0000 (11:01 -0700)]
Fix NPE when a library does not have a libs folder.
Change-Id: I382fb659073a8d2df8d018acde37d4769ac40cc0
The Android Open Source Project [Fri, 7 May 2010 14:24:20 +0000 (07:24 -0700)]
merge from tools_r6
Change-Id: I8a6773e95a8597a7cdb500e1775245c31530f75d
Xavier Ducrohet [Fri, 7 May 2010 01:08:46 +0000 (18:08 -0700)]
Add support for code-less project.
Change-Id: I09e8e5b40df3b8da4b34fe4f000e98263ea5bc55
Brett Chabot [Mon, 3 May 2010 19:47:49 +0000 (12:47 -0700)]
DO NOT MERGE: cherry-pick https://review.source.android.com/14536 into tools_r6.
Original commit message:
------------
Attempt to fix intermittent ADT test run failures.
Change the ADT test run steps to be more deterministic:
1) Start the JDT test run listener server side connection before the client
side (this is invokked via the launch.addProcess call)
2) Don't fork off a separate thread to run the tests. This was always
redundant and inefficient anyway, since the AndroidLaunchController already
forks off a thread to perform the launch
Bug 7976
Change-Id: Ie237e7d83e1f5a945a2061506b7c302c04aef8d0
Brett Chabot [Thu, 6 May 2010 00:11:39 +0000 (17:11 -0700)]
DO NOT MERGE: Cherry pick https://review.source.android.com/14514 into tools_r6,
Original commit message is:
-------------------
Add more console logs during ADT test run.
This is intended to give the user more visibility the exact progress of the
test run. And also better notification of failures.
Also tweak the ADT launch action so it reports its terminated when the test
runner thread is no longer active.
Related bug 7976
Change-Id: If6d0fd94930c57750af3f18bec1c8a0a8b4792e9
Xavier Ducrohet [Wed, 5 May 2010 22:58:16 +0000 (15:58 -0700)]
Merge "Add support for using newer Ant rules distributed by the tools."
Xavier Ducrohet [Wed, 5 May 2010 22:57:58 +0000 (15:57 -0700)]
Merge "Move all Ant rules under sdk/files/ant"
Xavier Ducrohet [Wed, 5 May 2010 22:57:49 +0000 (15:57 -0700)]
Merge "Add support for signing in the multi-apk ant build."
Xavier Ducrohet [Wed, 5 May 2010 22:31:14 +0000 (15:31 -0700)]
Add support for using newer Ant rules distributed by the tools.
Right now, the Ant rules are packaged with each platform. This
is a problem when we want to release newer versions of the rules,
as we would have to respin newer rev for all major platforms just
for that.
The new mechanism has the Ant rules both in the tools folder
and in the platforms. The platform indicates which versions
it supports (support is based on the features of external tools
such as aapt, aidl and dex). The custom tasks can
figure out a newer but still compatible (ie not relying on
newer options in aapt/aidl/dex) version from the tools folder
and then uses this newer version.
Change-Id: I763533ec85fa9647ecf96ac6cbaefbfd1ad68fb0
Xavier Ducrohet [Wed, 5 May 2010 21:10:40 +0000 (14:10 -0700)]
Move all Ant rules under sdk/files/ant
Change-Id: I7533b52a56c00502dce8798bf31ac50444543446
Xavier Ducrohet [Wed, 5 May 2010 20:59:01 +0000 (13:59 -0700)]
Add support for signing in the multi-apk ant build.
Change-Id: I0b0223b7fa5275995563a1a21192941bd72811cc
Jean-Baptiste Queru [Wed, 5 May 2010 20:23:09 +0000 (13:23 -0700)]
Merge "Small mask calculation optimization"
David Turner [Wed, 5 May 2010 18:08:47 +0000 (11:08 -0700)]
Merge "Add AT keyboard mappings for a BACK and MENU key"
Kenny Root [Wed, 5 May 2010 01:18:37 +0000 (18:18 -0700)]
Small mask calculation optimization
Get rid of loop to calculate bitmask where 2^n-1 will suffice.
Change-Id: I1d77a5c3753207663531efb407f6114ccabb1220
Bruce Beare [Tue, 4 May 2010 17:49:26 +0000 (10:49 -0700)]
Add AT keyboard mappings for a BACK and MENU key
BACK == ESC
MENU == F10
Xavier Ducrohet [Wed, 5 May 2010 00:46:54 +0000 (17:46 -0700)]
New If/Then/Else custom Ant rules to simplify some Ant rules logic.
Also cleaned up some attribute of our other custom tasks to conform
to the standard convention (all lower case, all those were new in r3)
Change-Id: If328a8eb2448d95bee1f1b70928d72fde5014eeb
The Android Open Source Project [Tue, 4 May 2010 18:28:32 +0000 (11:28 -0700)]
merge from tools_r6
Change-Id: Ie1ceaa134273b428424524cc594c9a2d999a481f
Xavier Ducrohet [Tue, 4 May 2010 18:17:04 +0000 (11:17 -0700)]
Fix displayed message in some ant targets.
Ouput properties were renamed from *.package to *.file
Change-Id: Id6885951f630a0507df0d68298778cd4cc64a4ad
Xavier Ducrohet [Tue, 4 May 2010 17:57:05 +0000 (10:57 -0700)]
Fix the Ant test rules r3
They were created from the wrong r2 file.
Change-Id: I62dc6c631cc7c1fdac6dd7ba57a776bb576e3c1f
Xavier Ducrohet [Tue, 4 May 2010 17:08:15 +0000 (10:08 -0700)]
Merge "First step of multiple apk support."
Xavier Ducrohet [Tue, 4 May 2010 01:18:04 +0000 (18:18 -0700)]
Merge "Resolves Issue 6219: simplify/automate "application" package name refactoring"
Xavier Ducrohet [Wed, 28 Apr 2010 23:28:35 +0000 (16:28 -0700)]
First step of multiple apk support.
- New export type project to handle exporting a single app represented
by multiple projects (for different minSdkVersion for instance).
- Cleaned-up the current Ant tasks and Eclipse builder to not
deal with ApkSettings anymore. It's not possible to generate
more than one APK in a single pass. The export project will
handle this and call out the normal build system to export
each variant. Make older (deprecated) attribute actually
output a warning.
- Ant rules r3 now with support for multi apk export. Lots
of clean up, add new properties to be overriden by the
multi-apk export task, make older one overrideable too.
- Better handling of older rules, older tasks, etc...
in the SetupTask used by the normal build.
- Add split by ABI to ApkSettings and use it in the
new multi apk export.
- New custom task for multi-apk export. Replaces
SetupTask for export-type projects. Calls out to the
project's build.xml after setting/overriding properties.
This also override the project's versionCode with a
new composite one made of different values.
Also uses a different build.xml, so added a new template:
build.export.template.
Very much a work in progress. Still to do:
Add other types of APK split, create/update export projects,
export the build log, ...
Also, we need to refactor the normal build rules to avoid
so much duplication!
Change-Id: I57a565c60d097a5eabb40108ae1fa8cb209f2380
Brett Chabot [Mon, 3 May 2010 22:24:04 +0000 (15:24 -0700)]
Merge "Attempt to fix intermittent ADT test run failures."
Karl Ostmo [Wed, 28 Apr 2010 20:35:29 +0000 (15:35 -0500)]
Resolves Issue 6219: simplify/automate "application" package name refactoring
Change-Id: Ide90aa1649ef36568400e98b470edffa4eaed64e
Brett Chabot [Mon, 3 May 2010 19:47:49 +0000 (12:47 -0700)]
Attempt to fix intermittent ADT test run failures.
Change the ADT test run steps to be more deterministic:
1) Start the JDT test run listener server side connection before the client
side (this is invokked via the launch.addProcess call)
2) Don't fork off a separate thread to run the tests. This was always
redundant and inefficient anyway, since the AndroidLaunchController already
forks off a thread to perform the launch
Bug 7976
Change-Id: If7d24998d6ebe1a9b2200717be6ba66c078017f9