Commit Graph

2842 Commits

Author SHA1 Message Date
Android (Google) Code Review
275de810e9 Merge change I2089d86d into eclair-sdk
* changes:
  Fix the android launcher script to not force Java 1.5 on MacOS
2009-10-29 15:28:07 -04:00
Xavier Ducrohet
dd4c6e5f3e Move SDK tools package to r4 2009-10-29 12:27:50 -07:00
Xavier Ducrohet
7bb72933c5 Fix the android launcher script to not force Java 1.5 on MacOS 2009-10-29 12:15:02 -07:00
Brett Chabot
a94518e3bc ADT test fixes.
Temporarily remove SampleProjectTest from continuous, since its failing at
every CL.
Adjust ApiDemosRenderingTest to use the SDK loaded by ADT.
Remove SdkEnvTestCase since it doesn't work in all situations.
Fix test data lookup for NinePatchTest and BridgeXmlBlockParserTest.

Bugs 2222616, 2218682
2009-10-28 18:22:15 -07:00
Raphael
e53083bc68 am 107b1a9e: Merge change Ie496edfa into eclair
Merge commit '107b1a9ee6c8e96027bec7a0caf16f723efd39ce' into eclair-plus-aosp

* commit '107b1a9ee6c8e96027bec7a0caf16f723efd39ce':
  SDK Updater: don't load sdk-repo XML that failed to validate.
2009-10-27 18:05:55 -07:00
Android (Google) Code Review
107b1a9ee6 Merge change Ie496edfa into eclair
* changes:
  SDK Updater: don't load sdk-repo XML that failed to validate.
2009-10-27 20:57:02 -04:00
Raphael
1de51457fa SDK Updater: don't load sdk-repo XML that failed to validate.
This also prints a more obvious message in case Java doesn't
have an XML Schema validator.

SDK BUGS 2219284 2198427

Change-Id: Ie496edfa7f0ca2802a537a7c6e84a88f177991a9
2009-10-27 17:48:16 -07:00
Raphael
99a08b066c am 09c5201a: Prepare version numbers for next SDK & tools
Merge commit '09c5201adca0ceb0e881832d53cfa9e412d07389' into eclair-plus-aosp

* commit '09c5201adca0ceb0e881832d53cfa9e412d07389':
  Prepare version numbers for next SDK & tools
2009-10-27 17:44:42 -07:00
Raphael
09c5201adc Prepare version numbers for next SDK & tools
Change-Id: I8e57df22462ec3e14e0f119b57999c208bb9d1fd
2009-10-27 15:33:17 -07:00
Brett Chabot
690557355c am 0c62341e: Merge change I3778cb73 into eclair
Merge commit '0c62341e8ec194a18bbf35fb380287c15d2da70d' into eclair-plus-aosp

* commit '0c62341e8ec194a18bbf35fb380287c15d2da70d':
  Fix runcommand logging exception.
2009-10-26 18:06:00 -07:00
Android (Google) Code Review
0c62341e8e Merge change I3778cb73 into eclair
* changes:
  Fix runcommand logging exception.
2009-10-26 20:55:49 -04:00
Brett Chabot
99e5f91aab Fix runcommand logging exception.
BUG 2215978
2009-10-26 17:52:34 -07:00
Raphael
7165792b6a am b3bca018: Merge change I337b2644 into eclair
Merge commit 'b3bca018783a0621b981ec8eb98dbbd15f450677' into eclair-plus-aosp

* commit 'b3bca018783a0621b981ec8eb98dbbd15f450677':
  SDK Manager > AVD > Start: print computed scale.
2009-10-26 16:25:40 -07:00
Android (Google) Code Review
b3bca01878 Merge change I337b2644 into eclair
* changes:
  SDK Manager > AVD > Start: print computed scale.
2009-10-26 19:12:43 -04:00
Xavier Ducrohet
ae35dfec1f am a73e4f9a: Merge change I7f60270f into eclair
Merge commit 'a73e4f9af7cafc9db6331ab0522c27bf75b2c3b2' into eclair-plus-aosp

* commit 'a73e4f9af7cafc9db6331ab0522c27bf75b2c3b2':
  ADT/GEL: Reenable config popup when switching from a device with only 1 config
2009-10-26 14:25:34 -07:00
Android (Google) Code Review
a73e4f9af7 Merge change I7f60270f into eclair
* changes:
  ADT/GEL: Reenable config popup when switching from a device with only 1 config
2009-10-26 17:16:46 -04:00
Brett Chabot
cad321b1ec am 3777f090: Merge change I25e7415f into eclair
Merge commit '3777f090a3a187bc251705028fe8cb019400e330' into eclair-plus-aosp

* commit '3777f090a3a187bc251705028fe8cb019400e330':
  Add runtest --path.
2009-10-26 14:14:50 -07:00
Android (Google) Code Review
3777f090a3 Merge change I25e7415f into eclair
* changes:
  Add runtest --path.
2009-10-26 17:05:20 -04:00
Xavier Ducrohet
d5f6e05716 ADT/GEL: Reenable config popup when switching from a device with only 1 config
Change-Id: I7f60270ffbcaae420f4da245ff3d9b271885fa37
BUG: 2218975
2009-10-26 13:55:27 -07:00
Raphael
87636aef44 SDK Manager > AVD > Start: print computed scale.
This displays the scale computed by AVD Start.
I find it more intuitive to use if I see what the
emulator will be called with.

Change-Id: I337b264437dee81aed1bb9a1fbd11ccc9f506e88
2009-10-26 12:26:27 -07:00
Brett Chabot
59b4778dd6 Add runtest --path.
This supports specifying a file system path to test(s) to run. The path can be
a java test class file, a java package directory, or a parent directory
containing many tests.

This change allows users to run tests independently from test_defs.xml.

BUG 2133198
2009-10-26 12:22:46 -07:00
Raphael
884c457885 am e7ff49b8: SDK Manager: properly reset tree when changing updates only
Merge commit 'e7ff49b82da151037ef5f221a95b95c897deab30' into eclair-plus-aosp

* commit 'e7ff49b82da151037ef5f221a95b95c897deab30':
  SDK Manager: properly reset tree when changing updates only
2009-10-23 13:56:41 -07:00
Raphael
e7ff49b82d SDK Manager: properly reset tree when changing updates only
SDK BUG 2210573

Change-Id: I32ce7387470cab771001a783b8afad399ab98f6a
2009-10-23 13:45:57 -07:00
David 'Digit' Turner
1caca4a28f am 27ad1ef8: Add a new sample named "hello-gl2" that shows how to call OGL ES 2.0 functions from native code through JNI.
Merge commit '27ad1ef820ef0fd8bfe47b440330975a3931b9c2' into eclair-plus-aosp

* commit '27ad1ef820ef0fd8bfe47b440330975a3931b9c2':
  Add a new sample named "hello-gl2" that shows how to call OGL ES 2.0 functions
2009-10-22 17:46:15 -07:00
David 'Digit' Turner
27ad1ef820 Add a new sample named "hello-gl2" that shows how to call OGL ES 2.0 functions
from native code through JNI.
2009-10-22 17:34:32 -07:00
Brett Chabot
eb405df365 am cdfea21f: Merge change Ie00595bd into eclair
Merge commit 'cdfea21f9285641d3040d4fb19138873086c9869' into eclair-plus-aosp

* commit 'cdfea21f9285641d3040d4fb19138873086c9869':
  Remove runtest dependency on current dir being build top.
2009-10-22 14:12:43 -07:00
Android (Google) Code Review
cdfea21f92 Merge change Ie00595bd into eclair
* changes:
  Remove runtest dependency on current dir being build top.
2009-10-22 17:03:44 -04:00
Dirk Dougherty
e22f0d88fa am 52508ffa: am aa95bfe2: doc change only: update gae python server script (tested)
Merge commit '52508ffa962b1fd9a47899b83e2e9106eac5b14d' into eclair-plus-aosp

* commit '52508ffa962b1fd9a47899b83e2e9106eac5b14d':
  doc change only: update gae python server script (tested)
2009-10-22 11:31:04 -07:00
Raphael
0b0f2566b5 am a16a134a: am 5d2a01ad: Merge change I235da4a8 into eclair-sdk
Merge commit 'a16a134a865b4e894c6667cb5b6d9e635baa53f2' into eclair-plus-aosp

* commit 'a16a134a865b4e894c6667cb5b6d9e635baa53f2':
  SDK android "update project" must not require --target parameter.
2009-10-22 11:31:00 -07:00
Dirk Dougherty
52508ffa96 am aa95bfe2: doc change only: update gae python server script (tested)
Merge commit 'aa95bfe2ace8940d6ab3ea5f17c733addfba2e53' into eclair

* commit 'aa95bfe2ace8940d6ab3ea5f17c733addfba2e53':
  doc change only: update gae python server script (tested)
2009-10-22 11:21:34 -07:00
Raphael
a16a134a86 am 5d2a01ad: Merge change I235da4a8 into eclair-sdk
Merge commit '5d2a01adfe11b9513cdf5da0fd6331c8cca05947' into eclair

* commit '5d2a01adfe11b9513cdf5da0fd6331c8cca05947':
  SDK android "update project" must not require --target parameter.
2009-10-22 11:20:33 -07:00
Brett Chabot
de387fd5b7 am 1cd61741: Add support to run only tests in a given java package.
Merge commit '1cd617413095758758beef03e3f45d26e9ad7751' into eclair-plus-aosp

* commit '1cd617413095758758beef03e3f45d26e9ad7751':
  Add support to run only tests in a given java package.
2009-10-22 11:14:56 -07:00
Brett Chabot
b967fc6a77 am 3447c407: Merge change I8f6ac3c9 into eclair
Merge commit '3447c407dc70a365d6d7faade0f3725315d05e54' into eclair-plus-aosp

* commit '3447c407dc70a365d6d7faade0f3725315d05e54':
  Refactor runtest test_defs to allow programmatic creation.
2009-10-22 11:13:52 -07:00
David 'Digit' Turner
b5cfac8cf3 am 9eff6cbf: Add OpenGL 2.0 headers and libraries to the NDK.
Merge commit '9eff6cbfaa210af0f5500f75576b457565cfafae' into eclair-plus-aosp

* commit '9eff6cbfaa210af0f5500f75576b457565cfafae':
  Add OpenGL 2.0 headers and libraries to the NDK.
2009-10-22 11:13:21 -07:00
David 'Digit' Turner
bda1e9c3ea am 975491c9: Add android-5 platform to the NDK.
Merge commit '975491c9ebb8ec659d96318df5f37f92c903f09f' into eclair-plus-aosp

* commit '975491c9ebb8ec659d96318df5f37f92c903f09f':
  Add android-5 platform to the NDK.
2009-10-22 11:12:30 -07:00
Brett Chabot
434f8bd9fc am 4ee04869: Merge change I12f05ef0 into eclair
Merge commit '4ee0486913f0a9a478e829ba33de2eb8bc6e8a49' into eclair-plus-aosp

* commit '4ee0486913f0a9a478e829ba33de2eb8bc6e8a49':
  Add ability to retrieve instrumentations from android_manifest parser.
2009-10-22 11:12:25 -07:00
Raphael
c289bed4c0 am f6f2d37d: Merge change I03351f1b into eclair
Merge commit 'f6f2d37d9365ad1bfd53da2134eeed8604c36954' into eclair-plus-aosp

* commit 'f6f2d37d9365ad1bfd53da2134eeed8604c36954':
  SDK Updater: switch UdpateChooserDialog to jface.
2009-10-22 11:12:11 -07:00
David 'Digit' Turner
2f739c316e am b48ab640: Allow applications to target future API levels
Merge commit 'b48ab6402801d82ac205b34ffa1bc6787a0042b6' into eclair-plus-aosp

* commit 'b48ab6402801d82ac205b34ffa1bc6787a0042b6':
  Allow applications to target future API levels
2009-10-22 11:12:05 -07:00
Android Git Automerger
4b03c2fe5e Previously merged by hand, now empty merge commit 'ec59a8834bbca256495045a6687a672f66b52df0' into eclair-plus-aosp 2009-10-22 10:53:11 -07:00
Brett Chabot
e00595bdbe Remove runtest dependency on current dir being build top.
This change is necessary to support relative path based args.
2009-10-21 20:01:31 -07:00
Dirk Dougherty
aa95bfe2ac doc change only: update gae python server script (tested) 2009-10-21 18:36:20 -07:00
Android Git Automerger
ac7e406b42 Part 2 of 2 for merge of ec59a8834b to workaround a git issue 2009-10-21 18:05:55 -07:00
Android Git Automerger
1fac8037fb Part 1 of 2 for merge of ec59a8834b to workaround a git issue 2009-10-21 18:00:34 -07:00
Brett Chabot
1cd6174130 Add support to run only tests in a given java package. 2009-10-21 17:00:58 -07:00
Android (Google) Code Review
3447c407dc Merge change I8f6ac3c9 into eclair
* changes:
  Refactor runtest test_defs to allow programmatic creation.
2009-10-21 18:53:58 -04:00
David 'Digit' Turner
9eff6cbfaa Add OpenGL 2.0 headers and libraries to the NDK.
This is only available for platform android-5. A sample
application will be available in a next patch.
2009-10-21 14:43:09 -07:00
Brett Chabot
924c089879 Refactor runtest test_defs to allow programmatic creation.
Previously a test definition could only be created via xml.
Also fix some minor lint warnings.
2009-10-21 14:35:37 -07:00
David 'Digit' Turner
975491c9eb Add android-5 platform to the NDK.
For now, this is an exact copy of android-4. Another patch will
provide additionnal headers and libraries for OpenGL 2.0 plus
the relevant documentation bits and a sample app.
2009-10-21 14:31:53 -07:00
Android (Google) Code Review
4ee0486913 Merge change I12f05ef0 into eclair
* changes:
  Add ability to retrieve instrumentations from android_manifest parser.
2009-10-21 17:26:32 -04:00
Android (Google) Code Review
f6f2d37d93 Merge change I03351f1b into eclair
* changes:
  SDK Updater: switch UdpateChooserDialog to jface.
2009-10-21 17:19:40 -04:00