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
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
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
David 'Digit' Turner
8c5b2b4b06
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.
2009-10-22 10:57:56 -07:00
Brett Chabot
4ec5a74731
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.
2009-10-22 10:57:52 -07:00
Raphael
6dc8fc626a
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.
2009-10-22 10:57:48 -07:00
David 'Digit' Turner
0fd84116ea
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
2009-10-22 10:57:44 -07:00
android-build SharedAccount
1d9db5a454
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.
2009-10-22 10:48:21 -07:00
android-build SharedAccount
da9996d2ce
am 1a4a01d6: Part 2 of 2 for merge of ec59a8834b to workaround a git issue
...
Merge commit '1a4a01d6a78f30067d75344e11a7cfa32ca9d7fd' into eclair-mr2-plus-aosp
* commit '1a4a01d6a78f30067d75344e11a7cfa32ca9d7fd':
Part 2 of 2 for merge of ec59a8834b to workaround a git issue
2009-10-22 10:48:17 -07:00
Brett Chabot
6ec0e33eeb
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.
2009-10-22 10:48:14 -07:00
android-build SharedAccount
9e5a3f7591
am b562394b: Part 1 of 2 for merge of ec59a8834b to workaround a git issue
...
Merge commit 'b562394bfe9d8df6fcb106eb58c42396d7330b79' into eclair-mr2-plus-aosp
* commit 'b562394bfe9d8df6fcb106eb58c42396d7330b79':
Part 1 of 2 for merge of ec59a8834b to workaround a git issue
2009-10-22 10:48:11 -07:00
Brett Chabot
b083cef9fb
am 3447c407: Merge change I8f6ac3c9 into eclair
...
Merge commit '3447c407dc70a365d6d7faade0f3725315d05e54' into eclair-mr2
* commit '3447c407dc70a365d6d7faade0f3725315d05e54':
Refactor runtest test_defs to allow programmatic creation.
2009-10-22 10:47:38 -07:00
David 'Digit' Turner
1dcfd370d6
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.
2009-10-22 10:47:08 -07:00
David 'Digit' Turner
cf89eb6c2d
am 975491c9: Add android-5 platform to the NDK.
...
Merge commit '975491c9ebb8ec659d96318df5f37f92c903f09f' into eclair-mr2
* commit '975491c9ebb8ec659d96318df5f37f92c903f09f':
Add android-5 platform to the NDK.
2009-10-22 10:46:26 -07:00
Brett Chabot
2ad4d5f31b
am 4ee04869: Merge change I12f05ef0 into eclair
...
Merge commit '4ee0486913f0a9a478e829ba33de2eb8bc6e8a49' into eclair-mr2
* commit '4ee0486913f0a9a478e829ba33de2eb8bc6e8a49':
Add ability to retrieve instrumentations from android_manifest parser.
2009-10-22 10:46:22 -07:00
Raphael
e9059bc822
am f6f2d37d: Merge change I03351f1b into eclair
...
Merge commit 'f6f2d37d9365ad1bfd53da2134eeed8604c36954' into eclair-mr2
* commit 'f6f2d37d9365ad1bfd53da2134eeed8604c36954':
SDK Updater: switch UdpateChooserDialog to jface.
2009-10-22 10:46:07 -07:00
David 'Digit' Turner
476ba9449a
am b48ab640: Allow applications to target future API levels
...
Merge commit 'b48ab6402801d82ac205b34ffa1bc6787a0042b6' into eclair-mr2
* commit 'b48ab6402801d82ac205b34ffa1bc6787a0042b6':
Allow applications to target future API levels
2009-10-22 10:45:58 -07:00
android-build SharedAccount
a8bd6dacdc
Previously merged by hand, now empty merge commit 'ec59a8834bbca256495045a6687a672f66b52df0' into eclair-mr2
2009-10-22 10:37:51 -07:00
android-build SharedAccount
1a4a01d6a7
Part 2 of 2 for merge of ec59a8834b to workaround a git issue
2009-10-22 10:36:13 -07:00
android-build SharedAccount
b562394bfe
Part 1 of 2 for merge of ec59a8834b to workaround a git issue
2009-10-22 10:32:15 -07:00
David 'Digit' Turner
888c76db93
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
2009-10-22 06:51:50 -07:00
David 'Digit' Turner
e5309ad850
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
2009-10-22 06:51:46 -07:00
Raphael
3c2e880a79
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
2009-10-22 06:51:42 -07:00
Raphael
377912f3f6
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
2009-10-22 06:51:38 -07:00
David 'Digit' Turner
6e8cfcece9
am 6f605c32: Merge change If7aa22af into eclair
...
Merge commit '6f605c32adfe3ac23bb91f857fa89b9cb037237a' into eclair-mr2
* commit '6f605c32adfe3ac23bb91f857fa89b9cb037237a':
Remove bash-ism from build-ndk-sysroot.sh
2009-10-22 06:38:55 -07:00
David 'Digit' Turner
1c962f8758
am fb766f44: Merge change I898b43fe into eclair
...
Merge commit 'fb766f44a71f7b97610065fd1628652026f69880' into eclair-mr2
* commit 'fb766f44a71f7b97610065fd1628652026f69880':
Refresh NDK C library headers for all platforms
2009-10-22 06:38:38 -07:00
Raphael
66d13f192b
am e97d99d0: am d58cd1b5: Merge change I075d2eae into eclair-sdk
...
Merge commit 'e97d99d02c655d3fa2801bb81787a1aff2d36d99' into eclair-mr2
* commit 'e97d99d02c655d3fa2801bb81787a1aff2d36d99':
SDK Updater: UI polish
2009-10-22 06:38:12 -07:00
Raphael
71ae9b3e2f
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
2009-10-22 06:38:07 -07:00
Raphael
b62c420829
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
2009-10-21 22:31:00 -07:00
Raphael
736393ef2c
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.
2009-10-21 22:30:55 -07:00
Raphael
d9d3891bf5
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
2009-10-21 22:22:16 -07:00
Raphael
17180783e5
am bf2cc38e: am 5708d157: Android.bat: remove /O in xcopy.
...
Merge commit 'bf2cc38e5b2a30f2f0906f3f37ed767af092956d' into eclair-mr2
* commit 'bf2cc38e5b2a30f2f0906f3f37ed767af092956d':
Android.bat: remove /O in xcopy.
2009-10-21 22:22: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
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