Commit Graph

3376 Commits

Author SHA1 Message Date
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
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 Git Automerger
4b03c2fe5e Previously merged by hand, now empty merge commit 'ec59a8834bbca256495045a6687a672f66b52df0' into eclair-plus-aosp 2009-10-22 10:53:11 -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
8face2c315 am 888c76db: am 6e8cfcec: am 6f605c32: Merge change If7aa22af into eclair
Merge commit '888c76db93c2d38fb3ac56f1be77d46af1dfef19'

* commit '888c76db93c2d38fb3ac56f1be77d46af1dfef19':
  Remove bash-ism from build-ndk-sysroot.sh
2009-10-22 07:00:33 -07:00
David 'Digit' Turner
9deb51faf8 am e5309ad8: am 1c962f87: am fb766f44: Merge change I898b43fe into eclair
Merge commit 'e5309ad8509f928ede3087d3afb176c099bc1dac'

* commit 'e5309ad8509f928ede3087d3afb176c099bc1dac':
  Refresh NDK C library headers for all platforms
2009-10-22 07:00:29 -07:00
Raphael
fb33493f07 am 3c2e880a: am 66d13f19: am e97d99d0: am d58cd1b5: Merge change I075d2eae into eclair-sdk
Merge commit '3c2e880a79c3e5014ad2ab0cc295ab238cb0c582'

* commit '3c2e880a79c3e5014ad2ab0cc295ab238cb0c582':
  SDK Updater: UI polish
2009-10-22 07:00:25 -07:00
Raphael
abcbd1a2ee 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
2009-10-22 07:00:21 -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
7a294e5e71 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
2009-10-21 22:44:28 -07:00
Raphael
0bb4ce5958 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.
2009-10-21 22:44:24 -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