Commit Graph

2944 Commits

Author SHA1 Message Date
Xavier Ducrohet
1bba62b3cb am a73e4f9a: Merge change I7f60270f into eclair
Merge commit 'a73e4f9af7cafc9db6331ab0522c27bf75b2c3b2' into eclair-mr2

* commit 'a73e4f9af7cafc9db6331ab0522c27bf75b2c3b2':
  ADT/GEL: Reenable config popup when switching from a device with only 1 config
2009-10-28 10:29:06 -07:00
Brett Chabot
2aa7a8b8c7 am 3777f090: Merge change I25e7415f into eclair
Merge commit '3777f090a3a187bc251705028fe8cb019400e330' into eclair-mr2

* commit '3777f090a3a187bc251705028fe8cb019400e330':
  Add runtest --path.
2009-10-28 10:28:49 -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
09c5201adc Prepare version numbers for next SDK & tools
Change-Id: I8e57df22462ec3e14e0f119b57999c208bb9d1fd
2009-10-27 15:33:17 -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
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
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
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
Eric Rowe
edef66bfab am cb69dd68: am c2139595: Merge change I65440eb5 into eclair-mr2
Merge commit 'cb69dd6822811de279ef88dd85add26ef2438e15'

* commit 'cb69dd6822811de279ef88dd85add26ef2438e15':
  Fix how the monkey counts events for scripts.
2009-10-23 16:12:44 -07:00
Eric Rowe
cb69dd6822 am c2139595: Merge change I65440eb5 into eclair-mr2
Merge commit 'c21395950ee1aca0f9e69ca5cc87ed40a53420bc' into eclair-mr2-plus-aosp

* commit 'c21395950ee1aca0f9e69ca5cc87ed40a53420bc':
  Fix how the monkey counts events for scripts.
2009-10-23 16:02:20 -07:00
Android (Google) Code Review
c21395950e Merge change I65440eb5 into eclair-mr2
* changes:
  Fix how the monkey counts events for scripts.
2009-10-23 18:51:06 -04:00
Raphael
e8e36ff795 am ccddf0ac: am 12dac0b1: am e7ff49b8: SDK Manager: properly reset tree when changing updates only
Merge commit 'ccddf0ac0b0b56169b546b36183594688959561f'

* commit 'ccddf0ac0b0b56169b546b36183594688959561f':
  SDK Manager: properly reset tree when changing updates only
2009-10-23 14:18:29 -07:00
Raphael
ccddf0ac0b am 12dac0b1: am e7ff49b8: SDK Manager: properly reset tree when changing updates only
Merge commit '12dac0b13bce0aa19cdc933107e1a733bc62e116' into eclair-mr2-plus-aosp

* commit '12dac0b13bce0aa19cdc933107e1a733bc62e116':
  SDK Manager: properly reset tree when changing updates only
2009-10-23 14:06:59 -07:00
Raphael
12dac0b13b am e7ff49b8: SDK Manager: properly reset tree when changing updates only
Merge commit 'e7ff49b82da151037ef5f221a95b95c897deab30' into eclair-mr2

* commit 'e7ff49b82da151037ef5f221a95b95c897deab30':
  SDK Manager: properly reset tree when changing updates only
2009-10-23 13:57:00 -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
4f40a2e225 am a6db4090: am c5679c41: 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 'a6db40906940e2fd942e2343b9d2d709f7fc71f9'

* commit 'a6db40906940e2fd942e2343b9d2d709f7fc71f9':
  Add a new sample named "hello-gl2" that shows how to call OGL ES 2.0 functions
2009-10-22 19:06:44 -07:00
Brett Chabot
390bd18b54 am 7627b95a: am cdbfd8ce: am cdfea21f: Merge change Ie00595bd into eclair
Merge commit '7627b95ae6f7c370ead3bd512e7604340ce06250'

* commit '7627b95ae6f7c370ead3bd512e7604340ce06250':
  Remove runtest dependency on current dir being build top.
2009-10-22 19:04:13 -07:00
David 'Digit' Turner
a6db409069 am c5679c41: 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 'c5679c41235148b285d6fe5bbbf1780d2a01e234' into eclair-mr2-plus-aosp

* commit 'c5679c41235148b285d6fe5bbbf1780d2a01e234':
  Add a new sample named "hello-gl2" that shows how to call OGL ES 2.0 functions
2009-10-22 17:56:51 -07:00
David 'Digit' Turner
c5679c4123 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-mr2

* commit '27ad1ef820ef0fd8bfe47b440330975a3931b9c2':
  Add a new sample named "hello-gl2" that shows how to call OGL ES 2.0 functions
2009-10-22 17:46:49 -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
7627b95ae6 am cdbfd8ce: am cdfea21f: Merge change Ie00595bd into eclair
Merge commit 'cdbfd8ceda1351761925da34b764fd31e352946e' into eclair-mr2-plus-aosp

* commit 'cdbfd8ceda1351761925da34b764fd31e352946e':
  Remove runtest dependency on current dir being build top.
2009-10-22 14:22:38 -07:00
Eric Rowe
65440eb58d Fix how the monkey counts events for scripts.
Instead of the monkey counting up to the count times the number of events in the
script, the monkey will now only increment the count when the script reaches the
end of the file.  This allows us to have multiple script files with differing
event counts in each.
2009-10-22 14:13:27 -07:00
Brett Chabot
cdbfd8ceda am cdfea21f: Merge change Ie00595bd into eclair
Merge commit 'cdfea21f9285641d3040d4fb19138873086c9869' into eclair-mr2

* commit 'cdfea21f9285641d3040d4fb19138873086c9869':
  Remove runtest dependency on current dir being build top.
2009-10-22 14:12:05 -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
17ad4f85df am 71f843c4: am 0bea8039: am 52508ffa: am aa95bfe2: doc change only: update gae python server script (tested)
Merge commit '71f843c4bd5a78f6fa7df7e76e9e37450dc5ac15'

* commit '71f843c4bd5a78f6fa7df7e76e9e37450dc5ac15':
  doc change only: update gae python server script (tested)
2009-10-22 11:51:04 -07:00
Raphael
ce0d76d3a4 am 3fbb07ad: am 1a0b151c: am a16a134a: am 5d2a01ad: Merge change I235da4a8 into eclair-sdk
Merge commit '3fbb07ad3777ed2809c952ba12ca1e0b0c779daf'

* commit '3fbb07ad3777ed2809c952ba12ca1e0b0c779daf':
  SDK android "update project" must not require --target parameter.
2009-10-22 11:51:00 -07:00
Dirk Dougherty
71f843c4bd am 0bea8039: am 52508ffa: am aa95bfe2: doc change only: update gae python server script (tested)
Merge commit '0bea80394096734af9a6c98d0cc6ef8b8b8e1826' into eclair-mr2-plus-aosp

* commit '0bea80394096734af9a6c98d0cc6ef8b8b8e1826':
  doc change only: update gae python server script (tested)
2009-10-22 11:41:30 -07:00
Raphael
3fbb07ad37 am 1a0b151c: am a16a134a: am 5d2a01ad: Merge change I235da4a8 into eclair-sdk
Merge commit '1a0b151ce6d3303554781f73e65e45cedaca5b17' into eclair-mr2-plus-aosp

* commit '1a0b151ce6d3303554781f73e65e45cedaca5b17':
  SDK android "update project" must not require --target parameter.
2009-10-22 11:41:25 -07:00
Dirk Dougherty
0bea803940 am 52508ffa: am aa95bfe2: doc change only: update gae python server script (tested)
Merge commit '52508ffa962b1fd9a47899b83e2e9106eac5b14d' into eclair-mr2

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

* commit 'a16a134a865b4e894c6667cb5b6d9e635baa53f2':
  SDK android "update project" must not require --target parameter.
2009-10-22 11:31:41 -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
3522af27d3 am dc0e9bf4: am 6ec0e33e: am 1cd61741: Add support to run only tests in a given java package.
Merge commit 'dc0e9bf4759c859f2e707ac2ca4386672d49d734'

* commit 'dc0e9bf4759c859f2e707ac2ca4386672d49d734':
  Add support to run only tests in a given java package.
2009-10-22 11:09:08 -07:00
Brett Chabot
f67908569f am 470b7360: am b083cef9: am 3447c407: Merge change I8f6ac3c9 into eclair
Merge commit '470b736082651fff15fc7be2057cb8c0f7722643'

* commit '470b736082651fff15fc7be2057cb8c0f7722643':
  Refactor runtest test_defs to allow programmatic creation.
2009-10-22 11:09:03 -07:00
David 'Digit' Turner
96a93a4f4d am d46629fd: am 1dcfd370: am 9eff6cbf: Add OpenGL 2.0 headers and libraries to the NDK.
Merge commit 'd46629fd94271a59419263372ee53d2a46a4507c'

* commit 'd46629fd94271a59419263372ee53d2a46a4507c':
  Add OpenGL 2.0 headers and libraries to the NDK.
2009-10-22 11:08:59 -07:00
David 'Digit' Turner
ab7a488e05 am 8c5b2b4b: am cf89eb6c: am 975491c9: Add android-5 platform to the NDK.
Merge commit '8c5b2b4b06c7d7130e0259feb93d8ae4b38480c7'

* commit '8c5b2b4b06c7d7130e0259feb93d8ae4b38480c7':
  Add android-5 platform to the NDK.
2009-10-22 11:08:54 -07:00
Brett Chabot
312d42e6a5 am 4ec5a747: am 2ad4d5f3: am 4ee04869: Merge change I12f05ef0 into eclair
Merge commit '4ec5a74731ce3b8cd0fa0073ef73009515df134d'

* commit '4ec5a74731ce3b8cd0fa0073ef73009515df134d':
  Add ability to retrieve instrumentations from android_manifest parser.
2009-10-22 11:08:50 -07:00
Raphael
2ab9fd0749 am 6dc8fc62: am e9059bc8: am f6f2d37d: Merge change I03351f1b into eclair
Merge commit '6dc8fc626a6f93ea8a7445dbf89630405b4dd8db'

* commit '6dc8fc626a6f93ea8a7445dbf89630405b4dd8db':
  SDK Updater: switch UdpateChooserDialog to jface.
2009-10-22 11:08:45 -07:00
David 'Digit' Turner
6fe63c47df am 0fd84116: am 476ba944: am b48ab640: Allow applications to target future API levels
Merge commit '0fd84116ea99e9a6bd9579fd33d8a150cd2b0794'

* commit '0fd84116ea99e9a6bd9579fd33d8a150cd2b0794':
  Allow applications to target future API levels
2009-10-22 11:08:41 -07:00
android-build SharedAccount
d59a3d2f8a am 1d9db5a4: am a8bd6dac: Previously merged by hand, now empty merge commit \'ec59a8834bbca256495045a6687a672f66b52df0\' into eclair-mr2
Merge commit '1d9db5a454395ed08f8f2b8c6ae9aa6dd7adcb73'

* commit '1d9db5a454395ed08f8f2b8c6ae9aa6dd7adcb73':
  Remove build/platforms/android-*/common directories.
2009-10-22 10:59:33 -07:00
android-build SharedAccount
d1171c96cc am da9996d2: am 1a4a01d6: Part 2 of 2 for merge of ec59a8834b to workaround a git issue
Merge commit 'da9996d2ced44fb42fe4c47796af685ae4208a9c'

* commit 'da9996d2ced44fb42fe4c47796af685ae4208a9c':
  Part 2 of 2 for merge of ec59a8834b to workaround a git issue
2009-10-22 10:59:28 -07:00
android-build SharedAccount
a47b76e19b am 9e5a3f75: am b562394b: Part 1 of 2 for merge of ec59a8834b to workaround a git issue
Merge commit '9e5a3f759169871996c7d7203e4de6454b94c47f'

* commit '9e5a3f759169871996c7d7203e4de6454b94c47f':
  Part 1 of 2 for merge of ec59a8834b to workaround a git issue
2009-10-22 10:59:21 -07:00
Brett Chabot
dc0e9bf475 am 6ec0e33e: am 1cd61741: Add support to run only tests in a given java package.
Merge commit '6ec0e33eeb4040494e4d6a3e260cdaf0c620eb83' into eclair-mr2-plus-aosp

* commit '6ec0e33eeb4040494e4d6a3e260cdaf0c620eb83':
  Add support to run only tests in a given java package.
2009-10-22 10:58:09 -07:00
Brett Chabot
470b736082 am b083cef9: am 3447c407: Merge change I8f6ac3c9 into eclair
Merge commit 'b083cef9fb75f6dfa6c041d275f78bcdfbe44207' into eclair-mr2-plus-aosp

* commit 'b083cef9fb75f6dfa6c041d275f78bcdfbe44207':
  Refactor runtest test_defs to allow programmatic creation.
2009-10-22 10:58:05 -07:00
David 'Digit' Turner
d46629fd94 am 1dcfd370: am 9eff6cbf: Add OpenGL 2.0 headers and libraries to the NDK.
Merge commit '1dcfd370d6a48e04a9ea302d289a409893096954' into eclair-mr2-plus-aosp

* commit '1dcfd370d6a48e04a9ea302d289a409893096954':
  Add OpenGL 2.0 headers and libraries to the NDK.
2009-10-22 10:58:01 -07:00