OSDN Git Service
Brett Chabot [Thu, 29 Oct 2009 06:51:16 +0000 (23:51 -0700)]
am
02a3c591: am
37a59807: am
0c62341e: Merge change I3778cb73 into eclair
Merge commit '
02a3c591af638cccd89eb740e9e33dbc179e59a2'
* commit '
02a3c591af638cccd89eb740e9e33dbc179e59a2':
Fix runcommand logging exception.
Raphael [Thu, 29 Oct 2009 06:51:09 +0000 (23:51 -0700)]
am
ecccc1eb: am
6fa10fac: am
b3bca018: Merge change I337b2644 into eclair
Merge commit '
ecccc1eb5617d9faccf93ce67c6d446d8106be88'
* commit '
ecccc1eb5617d9faccf93ce67c6d446d8106be88':
SDK Manager > AVD > Start: print computed scale.
Xavier Ducrohet [Thu, 29 Oct 2009 06:47:59 +0000 (23:47 -0700)]
am
c02e4504: am
1bba62b3: am
a73e4f9a: Merge change I7f60270f into eclair
Merge commit '
c02e450461779ae16708e337ad7f4eb515cfc3e0'
* commit '
c02e450461779ae16708e337ad7f4eb515cfc3e0':
ADT/GEL: Reenable config popup when switching from a device with only 1 config
Brett Chabot [Thu, 29 Oct 2009 06:47:52 +0000 (23:47 -0700)]
Brett Chabot [Wed, 28 Oct 2009 18:52:32 +0000 (11:52 -0700)]
am
37a59807: am
0c62341e: Merge change I3778cb73 into eclair
Merge commit '
37a59807b86d330c89904c25dd4540bce8898386' into eclair-mr2-plus-aosp
* commit '
37a59807b86d330c89904c25dd4540bce8898386':
Fix runcommand logging exception.
Raphael [Wed, 28 Oct 2009 18:52:27 +0000 (11:52 -0700)]
am
6fa10fac: am
b3bca018: Merge change I337b2644 into eclair
Merge commit '
6fa10fac30f79f7a2c59c2c477c757ede18f3aab' into eclair-mr2-plus-aosp
* commit '
6fa10fac30f79f7a2c59c2c477c757ede18f3aab':
SDK Manager > AVD > Start: print computed scale.
Brett Chabot [Wed, 28 Oct 2009 18:36:51 +0000 (11:36 -0700)]
am
0c62341e: Merge change I3778cb73 into eclair
Merge commit '
0c62341e8ec194a18bbf35fb380287c15d2da70d' into eclair-mr2
* commit '
0c62341e8ec194a18bbf35fb380287c15d2da70d':
Fix runcommand logging exception.
Raphael [Wed, 28 Oct 2009 18:35:39 +0000 (11:35 -0700)]
am
b3bca018: Merge change I337b2644 into eclair
Merge commit '
b3bca018783a0621b981ec8eb98dbbd15f450677' into eclair-mr2
* commit '
b3bca018783a0621b981ec8eb98dbbd15f450677':
SDK Manager > AVD > Start: print computed scale.
Xavier Ducrohet [Wed, 28 Oct 2009 17:41:55 +0000 (10:41 -0700)]
am
1bba62b3: am
a73e4f9a: Merge change I7f60270f into eclair
Merge commit '
1bba62b3cba57906bcddd9868e67aa1ef2d150d3' into eclair-mr2-plus-aosp
* commit '
1bba62b3cba57906bcddd9868e67aa1ef2d150d3':
ADT/GEL: Reenable config popup when switching from a device with only 1 config
Brett Chabot [Wed, 28 Oct 2009 17:41:49 +0000 (10:41 -0700)]
am
2aa7a8b8: am
3777f090: Merge change I25e7415f into eclair
Merge commit '
2aa7a8b8c7bd76c5c49fc570d88826bec4393524' into eclair-mr2-plus-aosp
* commit '
2aa7a8b8c7bd76c5c49fc570d88826bec4393524':
Add runtest --path.
Xavier Ducrohet [Wed, 28 Oct 2009 17:29:06 +0000 (10:29 -0700)]
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
Brett Chabot [Wed, 28 Oct 2009 17:28:49 +0000 (10:28 -0700)]
am
3777f090: Merge change I25e7415f into eclair
Merge commit '
3777f090a3a187bc251705028fe8cb019400e330' into eclair-mr2
* commit '
3777f090a3a187bc251705028fe8cb019400e330':
Add runtest --path.
Android (Google) Code Review [Tue, 27 Oct 2009 00:55:49 +0000 (20:55 -0400)]
Merge change I3778cb73 into eclair
* changes:
Fix runcommand logging exception.
Brett Chabot [Mon, 26 Oct 2009 21:51:45 +0000 (14:51 -0700)]
Fix runcommand logging exception.
BUG
2215978
Android (Google) Code Review [Mon, 26 Oct 2009 23:12:43 +0000 (19:12 -0400)]
Merge change I337b2644 into eclair
* changes:
SDK Manager > AVD > Start: print computed scale.
Android (Google) Code Review [Mon, 26 Oct 2009 21:16:46 +0000 (17:16 -0400)]
Merge change I7f60270f into eclair
* changes:
ADT/GEL: Reenable config popup when switching from a device with only 1 config
Android (Google) Code Review [Mon, 26 Oct 2009 21:05:20 +0000 (17:05 -0400)]
Merge change I25e7415f into eclair
* changes:
Add runtest --path.
Xavier Ducrohet [Mon, 26 Oct 2009 20:55:27 +0000 (13:55 -0700)]
ADT/GEL: Reenable config popup when switching from a device with only 1 config
Change-Id: I7f60270ffbcaae420f4da245ff3d9b271885fa37
BUG:
2218975
Raphael [Sun, 25 Oct 2009 00:24:33 +0000 (17:24 -0700)]
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
Brett Chabot [Thu, 22 Oct 2009 00:23:01 +0000 (17:23 -0700)]
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
Eric Rowe [Fri, 23 Oct 2009 23:12:44 +0000 (16:12 -0700)]
am
cb69dd68: am
c2139595: Merge change I65440eb5 into eclair-mr2
Merge commit '
cb69dd6822811de279ef88dd85add26ef2438e15'
* commit '
cb69dd6822811de279ef88dd85add26ef2438e15':
Fix how the monkey counts events for scripts.
Eric Rowe [Fri, 23 Oct 2009 23:02:20 +0000 (16:02 -0700)]
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.
Android (Google) Code Review [Fri, 23 Oct 2009 22:51:06 +0000 (18:51 -0400)]
Merge change I65440eb5 into eclair-mr2
* changes:
Fix how the monkey counts events for scripts.
Raphael [Fri, 23 Oct 2009 21:18:29 +0000 (14:18 -0700)]
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
Raphael [Fri, 23 Oct 2009 21:06:59 +0000 (14:06 -0700)]
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
Raphael [Fri, 23 Oct 2009 20:57:00 +0000 (13:57 -0700)]
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
Raphael [Fri, 23 Oct 2009 20:32:32 +0000 (13:32 -0700)]
SDK Manager: properly reset tree when changing updates only
SDK BUG
2210573
Change-Id: I32ce7387470cab771001a783b8afad399ab98f6a
David 'Digit' Turner [Fri, 23 Oct 2009 02:06:44 +0000 (19:06 -0700)]
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
Brett Chabot [Fri, 23 Oct 2009 02:04:13 +0000 (19:04 -0700)]
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.
David 'Digit' Turner [Fri, 23 Oct 2009 00:56:51 +0000 (17:56 -0700)]
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
David 'Digit' Turner [Fri, 23 Oct 2009 00:46:49 +0000 (17:46 -0700)]
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
David 'Digit' Turner [Thu, 22 Oct 2009 23:59:10 +0000 (16:59 -0700)]
Add a new sample named "hello-gl2" that shows how to call OGL ES 2.0 functions
from native code through JNI.
Brett Chabot [Thu, 22 Oct 2009 21:22:38 +0000 (14:22 -0700)]
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.
Eric Rowe [Thu, 22 Oct 2009 21:13:27 +0000 (14:13 -0700)]
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.
Brett Chabot [Thu, 22 Oct 2009 21:12:05 +0000 (14:12 -0700)]
am
cdfea21f: Merge change Ie00595bd into eclair
Merge commit '
cdfea21f9285641d3040d4fb19138873086c9869' into eclair-mr2
* commit '
cdfea21f9285641d3040d4fb19138873086c9869':
Remove runtest dependency on current dir being build top.
Android (Google) Code Review [Thu, 22 Oct 2009 21:03:44 +0000 (17:03 -0400)]
Merge change Ie00595bd into eclair
* changes:
Remove runtest dependency on current dir being build top.
Dirk Dougherty [Thu, 22 Oct 2009 18:51:04 +0000 (11:51 -0700)]
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)
Raphael [Thu, 22 Oct 2009 18:51:00 +0000 (11:51 -0700)]
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.
Dirk Dougherty [Thu, 22 Oct 2009 18:41:30 +0000 (11:41 -0700)]
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)
Raphael [Thu, 22 Oct 2009 18:41:25 +0000 (11:41 -0700)]
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.
Dirk Dougherty [Thu, 22 Oct 2009 18:31:46 +0000 (11:31 -0700)]
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)
Raphael [Thu, 22 Oct 2009 18:31:41 +0000 (11:31 -0700)]
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.
Dirk Dougherty [Thu, 22 Oct 2009 18:21:34 +0000 (11:21 -0700)]
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)
Raphael [Thu, 22 Oct 2009 18:20:33 +0000 (11:20 -0700)]
am
5d2a01ad: Merge change I235da4a8 into eclair-sdk
Merge commit '
5d2a01adfe11b9513cdf5da0fd6331c8cca05947' into eclair
* commit '
5d2a01adfe11b9513cdf5da0fd6331c8cca05947':
SDK android "update project" must not require --target parameter.
Brett Chabot [Thu, 22 Oct 2009 18:09:08 +0000 (11:09 -0700)]
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.
Brett Chabot [Thu, 22 Oct 2009 18:09:03 +0000 (11:09 -0700)]
am
470b7360: am
b083cef9: am
3447c407: Merge change I8f6ac3c9 into eclair
Merge commit '
470b736082651fff15fc7be2057cb8c0f7722643'
* commit '
470b736082651fff15fc7be2057cb8c0f7722643':
Refactor runtest test_defs to allow programmatic creation.
David 'Digit' Turner [Thu, 22 Oct 2009 18:08:59 +0000 (11:08 -0700)]
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.
David 'Digit' Turner [Thu, 22 Oct 2009 18:08:54 +0000 (11:08 -0700)]
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.
Brett Chabot [Thu, 22 Oct 2009 18:08:50 +0000 (11:08 -0700)]
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.
Raphael [Thu, 22 Oct 2009 18:08:45 +0000 (11:08 -0700)]
am
6dc8fc62: am
e9059bc8: am
f6f2d37d: Merge change I03351f1b into eclair
Merge commit '
6dc8fc626a6f93ea8a7445dbf89630405b4dd8db'
* commit '
6dc8fc626a6f93ea8a7445dbf89630405b4dd8db':
SDK Updater: switch UdpateChooserDialog to jface.
David 'Digit' Turner [Thu, 22 Oct 2009 18:08:41 +0000 (11:08 -0700)]
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
android-build SharedAccount [Thu, 22 Oct 2009 17:59:33 +0000 (10:59 -0700)]
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.
android-build SharedAccount [Thu, 22 Oct 2009 17:59:28 +0000 (10:59 -0700)]
android-build SharedAccount [Thu, 22 Oct 2009 17:59:21 +0000 (10:59 -0700)]
Brett Chabot [Thu, 22 Oct 2009 17:58:09 +0000 (10:58 -0700)]
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.
Brett Chabot [Thu, 22 Oct 2009 17:58:05 +0000 (10:58 -0700)]
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.
David 'Digit' Turner [Thu, 22 Oct 2009 17:58:01 +0000 (10:58 -0700)]
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.
David 'Digit' Turner [Thu, 22 Oct 2009 17:57:56 +0000 (10:57 -0700)]
am
cf89eb6c: am
975491c9: Add android-5 platform to the NDK.
Merge commit '
cf89eb6c2d1844c0701b0ba707a3e4fb9544af44' into eclair-mr2-plus-aosp
* commit '
cf89eb6c2d1844c0701b0ba707a3e4fb9544af44':
Add android-5 platform to the NDK.
Brett Chabot [Thu, 22 Oct 2009 17:57:52 +0000 (10:57 -0700)]
am
2ad4d5f3: am
4ee04869: Merge change I12f05ef0 into eclair
Merge commit '
2ad4d5f31be2acdfb487f5e8ccea60d707aab91c' into eclair-mr2-plus-aosp
* commit '
2ad4d5f31be2acdfb487f5e8ccea60d707aab91c':
Add ability to retrieve instrumentations from android_manifest parser.
Raphael [Thu, 22 Oct 2009 17:57:48 +0000 (10:57 -0700)]
am
e9059bc8: am
f6f2d37d: Merge change I03351f1b into eclair
Merge commit '
e9059bc82263ae8f359100ab90e46ca8d36ffad3' into eclair-mr2-plus-aosp
* commit '
e9059bc82263ae8f359100ab90e46ca8d36ffad3':
SDK Updater: switch UdpateChooserDialog to jface.
David 'Digit' Turner [Thu, 22 Oct 2009 17:57:44 +0000 (10:57 -0700)]
am
476ba944: am
b48ab640: Allow applications to target future API levels
Merge commit '
476ba9449a3eeb997312ec35ab02a08cd5f7bf47' into eclair-mr2-plus-aosp
* commit '
476ba9449a3eeb997312ec35ab02a08cd5f7bf47':
Allow applications to target future API levels
android-build SharedAccount [Thu, 22 Oct 2009 17:48:21 +0000 (10:48 -0700)]
am
a8bd6dac: Previously merged by hand, now empty merge commit \'
ec59a8834bbca256495045a6687a672f66b52df0\' into eclair-mr2
Merge commit '
a8bd6dacdc308cdecb6864a08ba28beed3eef86c' into eclair-mr2-plus-aosp
* commit '
a8bd6dacdc308cdecb6864a08ba28beed3eef86c':
Remove build/platforms/android-*/common directories.
android-build SharedAccount [Thu, 22 Oct 2009 17:48:17 +0000 (10:48 -0700)]
Brett Chabot [Thu, 22 Oct 2009 17:48:14 +0000 (10:48 -0700)]
am
1cd61741: Add support to run only tests in a given java package.
Merge commit '
1cd617413095758758beef03e3f45d26e9ad7751' into eclair-mr2
* commit '
1cd617413095758758beef03e3f45d26e9ad7751':
Add support to run only tests in a given java package.
android-build SharedAccount [Thu, 22 Oct 2009 17:48:11 +0000 (10:48 -0700)]
Brett Chabot [Thu, 22 Oct 2009 17:47:38 +0000 (10:47 -0700)]
am
3447c407: Merge change I8f6ac3c9 into eclair
Merge commit '
3447c407dc70a365d6d7faade0f3725315d05e54' into eclair-mr2
* commit '
3447c407dc70a365d6d7faade0f3725315d05e54':
Refactor runtest test_defs to allow programmatic creation.
David 'Digit' Turner [Thu, 22 Oct 2009 17:47:08 +0000 (10:47 -0700)]
am
9eff6cbf: Add OpenGL 2.0 headers and libraries to the NDK.
Merge commit '
9eff6cbfaa210af0f5500f75576b457565cfafae' into eclair-mr2
* commit '
9eff6cbfaa210af0f5500f75576b457565cfafae':
Add OpenGL 2.0 headers and libraries to the NDK.
David 'Digit' Turner [Thu, 22 Oct 2009 17:46:26 +0000 (10:46 -0700)]
am
975491c9: Add android-5 platform to the NDK.
Merge commit '
975491c9ebb8ec659d96318df5f37f92c903f09f' into eclair-mr2
* commit '
975491c9ebb8ec659d96318df5f37f92c903f09f':
Add android-5 platform to the NDK.
Brett Chabot [Thu, 22 Oct 2009 17:46:22 +0000 (10:46 -0700)]
am
4ee04869: Merge change I12f05ef0 into eclair
Merge commit '
4ee0486913f0a9a478e829ba33de2eb8bc6e8a49' into eclair-mr2
* commit '
4ee0486913f0a9a478e829ba33de2eb8bc6e8a49':
Add ability to retrieve instrumentations from android_manifest parser.
Raphael [Thu, 22 Oct 2009 17:46:07 +0000 (10:46 -0700)]
am
f6f2d37d: Merge change I03351f1b into eclair
Merge commit '
f6f2d37d9365ad1bfd53da2134eeed8604c36954' into eclair-mr2
* commit '
f6f2d37d9365ad1bfd53da2134eeed8604c36954':
SDK Updater: switch UdpateChooserDialog to jface.
David 'Digit' Turner [Thu, 22 Oct 2009 17:45:58 +0000 (10:45 -0700)]
am
b48ab640: Allow applications to target future API levels
Merge commit '
b48ab6402801d82ac205b34ffa1bc6787a0042b6' into eclair-mr2
* commit '
b48ab6402801d82ac205b34ffa1bc6787a0042b6':
Allow applications to target future API levels
android-build SharedAccount [Thu, 22 Oct 2009 17:37:19 +0000 (10:37 -0700)]
Previously merged by hand, now empty merge commit '
ec59a8834bbca256495045a6687a672f66b52df0' into eclair-mr2
android-build SharedAccount [Thu, 22 Oct 2009 17:36:13 +0000 (10:36 -0700)]
Part 2 of 2 for merge of
ec59a8834bbca256495045a6687a672f66b52df0 to workaround a git issue
android-build SharedAccount [Thu, 22 Oct 2009 17:32:15 +0000 (10:32 -0700)]
Part 1 of 2 for merge of
ec59a8834bbca256495045a6687a672f66b52df0 to workaround a git issue
David 'Digit' Turner [Thu, 22 Oct 2009 14:00:33 +0000 (07:00 -0700)]
am
888c76db: am
6e8cfcec: am
6f605c32: Merge change If7aa22af into eclair
Merge commit '
888c76db93c2d38fb3ac56f1be77d46af1dfef19'
* commit '
888c76db93c2d38fb3ac56f1be77d46af1dfef19':
Remove bash-ism from build-ndk-sysroot.sh
David 'Digit' Turner [Thu, 22 Oct 2009 14:00:29 +0000 (07:00 -0700)]
am
e5309ad8: am
1c962f87: am
fb766f44: Merge change I898b43fe into eclair
Merge commit '
e5309ad8509f928ede3087d3afb176c099bc1dac'
* commit '
e5309ad8509f928ede3087d3afb176c099bc1dac':
Refresh NDK C library headers for all platforms
Raphael [Thu, 22 Oct 2009 14:00:25 +0000 (07:00 -0700)]
Raphael [Thu, 22 Oct 2009 14:00:21 +0000 (07:00 -0700)]
am
377912f3: am
71ae9b3e: am
d75c03e4: am
7c1adfe7: Merge change I5b1f8bca into eclair-sdk
Merge commit '
377912f3f6c765e981222c808c0d6240c20db502'
* commit '
377912f3f6c765e981222c808c0d6240c20db502':
AVD Manager: Properly disable AVD > Start > ? under Windows
David 'Digit' Turner [Thu, 22 Oct 2009 13:51:50 +0000 (06:51 -0700)]
am
6e8cfcec: am
6f605c32: Merge change If7aa22af into eclair
Merge commit '
6e8cfcece99260eb2ce539797551153d72b6ca29' into eclair-mr2-plus-aosp
* commit '
6e8cfcece99260eb2ce539797551153d72b6ca29':
Remove bash-ism from build-ndk-sysroot.sh
David 'Digit' Turner [Thu, 22 Oct 2009 13:51:46 +0000 (06:51 -0700)]
am
1c962f87: am
fb766f44: Merge change I898b43fe into eclair
Merge commit '
1c962f8758bb7e80639da221788f571dddcc8b02' into eclair-mr2-plus-aosp
* commit '
1c962f8758bb7e80639da221788f571dddcc8b02':
Refresh NDK C library headers for all platforms
Raphael [Thu, 22 Oct 2009 13:51:42 +0000 (06:51 -0700)]
am
66d13f19: am
e97d99d0: am
d58cd1b5: Merge change I075d2eae into eclair-sdk
Merge commit '
66d13f192b50aef39272da5330d4484de7d68ca4' into eclair-mr2-plus-aosp
* commit '
66d13f192b50aef39272da5330d4484de7d68ca4':
SDK Updater: UI polish
Raphael [Thu, 22 Oct 2009 13:51:38 +0000 (06:51 -0700)]
am
71ae9b3e: am
d75c03e4: am
7c1adfe7: Merge change I5b1f8bca into eclair-sdk
Merge commit '
71ae9b3e2f79a7fbfaf9283f75252988e1df5414' into eclair-mr2-plus-aosp
* commit '
71ae9b3e2f79a7fbfaf9283f75252988e1df5414':
AVD Manager: Properly disable AVD > Start > ? under Windows
David 'Digit' Turner [Thu, 22 Oct 2009 13:38:55 +0000 (06:38 -0700)]
am
6f605c32: Merge change If7aa22af into eclair
Merge commit '
6f605c32adfe3ac23bb91f857fa89b9cb037237a' into eclair-mr2
* commit '
6f605c32adfe3ac23bb91f857fa89b9cb037237a':
Remove bash-ism from build-ndk-sysroot.sh
David 'Digit' Turner [Thu, 22 Oct 2009 13:38:38 +0000 (06:38 -0700)]
am
fb766f44: Merge change I898b43fe into eclair
Merge commit '
fb766f44a71f7b97610065fd1628652026f69880' into eclair-mr2
* commit '
fb766f44a71f7b97610065fd1628652026f69880':
Refresh NDK C library headers for all platforms
Raphael [Thu, 22 Oct 2009 13:38:12 +0000 (06:38 -0700)]
am
e97d99d0: am
d58cd1b5: Merge change I075d2eae into eclair-sdk
Merge commit '
e97d99d02c655d3fa2801bb81787a1aff2d36d99' into eclair-mr2
* commit '
e97d99d02c655d3fa2801bb81787a1aff2d36d99':
SDK Updater: UI polish
Raphael [Thu, 22 Oct 2009 13:38:07 +0000 (06:38 -0700)]
am
d75c03e4: am
7c1adfe7: Merge change I5b1f8bca into eclair-sdk
Merge commit '
d75c03e4f18b11ba6f13112be3232db6795ed0fe' into eclair-mr2
* commit '
d75c03e4f18b11ba6f13112be3232db6795ed0fe':
AVD Manager: Properly disable AVD > Start > ? under Windows
Raphael [Thu, 22 Oct 2009 05:44:28 +0000 (22:44 -0700)]
am
b62c4208: am
d9d3891b: am
90b60a39: am
c9b04450: Merge change I4151529e into eclair-sdk
Merge commit '
b62c420829f1bc23bf700b7036cc8361e3c61e9f'
* commit '
b62c420829f1bc23bf700b7036cc8361e3c61e9f':
Fix potential NPE in manifest editor when switching SDKs
Raphael [Thu, 22 Oct 2009 05:44:24 +0000 (22:44 -0700)]
am
736393ef: am
17180783: am
bf2cc38e: am
5708d157: Android.bat: remove /O in xcopy.
Merge commit '
736393ef2c62612dd2c86eb9c5e9dd33f09d9a69'
* commit '
736393ef2c62612dd2c86eb9c5e9dd33f09d9a69':
Android.bat: remove /O in xcopy.
Raphael [Thu, 22 Oct 2009 05:31:00 +0000 (22:31 -0700)]
am
d9d3891b: am
90b60a39: am
c9b04450: Merge change I4151529e into eclair-sdk
Merge commit '
d9d3891bf5f4922520783f2fbb1ff4ec61403ba0' into eclair-mr2-plus-aosp
* commit '
d9d3891bf5f4922520783f2fbb1ff4ec61403ba0':
Fix potential NPE in manifest editor when switching SDKs
Raphael [Thu, 22 Oct 2009 05:30:55 +0000 (22:30 -0700)]
am
17180783: am
bf2cc38e: am
5708d157: Android.bat: remove /O in xcopy.
Merge commit '
17180783e53f84d244e7c61d890039d9fa783443' into eclair-mr2-plus-aosp
* commit '
17180783e53f84d244e7c61d890039d9fa783443':
Android.bat: remove /O in xcopy.
Raphael [Thu, 22 Oct 2009 05:22:16 +0000 (22:22 -0700)]
am
90b60a39: am
c9b04450: Merge change I4151529e into eclair-sdk
Merge commit '
90b60a3985d07f6113d91737fcd37da2d282ce8f' into eclair-mr2
* commit '
90b60a3985d07f6113d91737fcd37da2d282ce8f':
Fix potential NPE in manifest editor when switching SDKs
Raphael [Thu, 22 Oct 2009 05:22:11 +0000 (22:22 -0700)]
am
bf2cc38e: am
5708d157: Android.bat: remove /O in xcopy.
Merge commit '
bf2cc38e5b2a30f2f0906f3f37ed767af092956d' into eclair-mr2
* commit '
bf2cc38e5b2a30f2f0906f3f37ed767af092956d':
Android.bat: remove /O in xcopy.
Brett Chabot [Thu, 22 Oct 2009 03:01:31 +0000 (20:01 -0700)]
Remove runtest dependency on current dir being build top.
This change is necessary to support relative path based args.
Dirk Dougherty [Sat, 10 Oct 2009 00:15:52 +0000 (17:15 -0700)]
doc change only: update gae python server script (tested)
Brett Chabot [Thu, 22 Oct 2009 00:00:58 +0000 (17:00 -0700)]
Add support to run only tests in a given java package.
Android (Google) Code Review [Wed, 21 Oct 2009 22:53:58 +0000 (18:53 -0400)]
Merge change I8f6ac3c9 into eclair
* changes:
Refactor runtest test_defs to allow programmatic creation.
David 'Digit' Turner [Wed, 21 Oct 2009 21:43:09 +0000 (14:43 -0700)]
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.
Brett Chabot [Wed, 21 Oct 2009 21:23:54 +0000 (14:23 -0700)]
Refactor runtest test_defs to allow programmatic creation.
Previously a test definition could only be created via xml.
Also fix some minor lint warnings.
David 'Digit' Turner [Wed, 21 Oct 2009 17:26:03 +0000 (10:26 -0700)]
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.
Android (Google) Code Review [Wed, 21 Oct 2009 21:26:32 +0000 (17:26 -0400)]
Merge change I12f05ef0 into eclair
* changes:
Add ability to retrieve instrumentations from android_manifest parser.