Commit Graph

2826 Commits

Author SHA1 Message Date
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
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
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
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
David 'Digit' Turner
b48ab64028 Allow applications to target future API levels
E.g. if an application's default.properties targets android-10
then the build system will default it to the highest supported
API level found in build/platforms (e.g. android-4 currently).
2009-10-21 10:19:07 -07:00
Android (Google) Code Review
ec59a8834b Merge change I31f23a0b into eclair
* changes:
  Remove build/platforms/android-*/common directories.
2009-10-20 19:23:59 -04:00
Android (Google) Code Review
6f605c32ad Merge change If7aa22af into eclair
* changes:
  Remove bash-ism from build-ndk-sysroot.sh
2009-10-20 19:18:07 -04:00
David 'Digit' Turner
31f23a0b9f Remove build/platforms/android-*/common directories.
There is little point to use symlinks to point to them from
android-*/arch-arm/usr/include. Besides, the zip file format doesn't
support symlinks which meant that each file was essentially
duplicated in the final release package.
2009-10-20 15:53:42 -07:00
Android (Google) Code Review
fb766f44a7 Merge change I898b43fe into eclair
* changes:
  Refresh NDK C library headers for all platforms
2009-10-20 18:53:24 -04:00
Android (Google) Code Review
f2678d5dbd Merge change Ife1f456a
* changes:
  Added Release Checklist to PDK. Original content written by Dianne.
2009-10-20 18:51:07 -04:00
David 'Digit' Turner
f7aa22af3c Remove bash-ism from build-ndk-sysroot.sh 2009-10-20 15:33:40 -07:00
Raphael
e97d99d02c am d58cd1b5: Merge change I075d2eae into eclair-sdk
Merge commit 'd58cd1b5d3bfc2433201fbe22621f4924a89c04d' into eclair

* commit 'd58cd1b5d3bfc2433201fbe22621f4924a89c04d':
  SDK Updater: UI polish
2009-10-20 15:32:13 -07:00
Raphael
d75c03e4f1 am 7c1adfe7: Merge change I5b1f8bca into eclair-sdk
Merge commit '7c1adfe76fbf89cc76ff51bf0d228c13213fe563' into eclair

* commit '7c1adfe76fbf89cc76ff51bf0d228c13213fe563':
  AVD Manager: Properly disable AVD > Start > ? under Windows
2009-10-20 15:32:09 -07:00
David 'Digit' Turner
898b43fedc Refresh NDK C library headers for all platforms 2009-10-20 15:25:40 -07:00
Android (Google) Code Review
d58cd1b5d3 Merge change I075d2eae into eclair-sdk
* changes:
  SDK Updater: UI polish
2009-10-20 18:18:18 -04:00
Android (Google) Code Review
7c1adfe76f Merge change I5b1f8bca into eclair-sdk
* changes:
  AVD Manager: Properly disable AVD > Start > ? under Windows
2009-10-20 18:16:59 -04:00
Raphael
ab36793247 AVD Manager: Properly disable AVD > Start > ? under Windows
SDK BUG 2201546

Change-Id: I5b1f8bcaf57f2e7f94b4109cb62a3a5eadcd24a9
2009-10-20 15:09:56 -07:00
Raphael
301eea2962 SDK Updater: UI polish
Fixes the following issues:
- Updater says it didnd't install addon and then install it
  (cause: UpdaterData was looking for an ArchiveInfo in a map of Archive)
- Added a label explaining the [*] in the dependency list.
- Added the originating site to the long description in the package chooser.
- Display downloading/installing comments in the result window.
- Fixed app name in dialog when tools are updated.

Change-Id: I075d2eaeb357f33671f7e9e70a906ca48000908d
2009-10-20 14:54:30 -07:00
David Warren
fe1f456a44 Added Release Checklist to PDK. Original content written by Dianne. 2009-10-20 13:39:56 -07:00
Raphael
90b60a3985 am c9b04450: Merge change I4151529e into eclair-sdk
Merge commit 'c9b04450ef204e03de3f3da886cd45808550dfbc' into eclair

* commit 'c9b04450ef204e03de3f3da886cd45808550dfbc':
  Fix potential NPE in manifest editor when switching SDKs
2009-10-20 13:19:58 -07:00
Raphael
bf2cc38e5b am 5708d157: Android.bat: remove /O in xcopy.
Merge commit '5708d1576b3e19601804ea7dfffdee3da6c0c00d' into eclair

* commit '5708d1576b3e19601804ea7dfffdee3da6c0c00d':
  Android.bat: remove /O in xcopy.
2009-10-20 13:19:54 -07:00
Android (Google) Code Review
c9b04450ef Merge change I4151529e into eclair-sdk
* changes:
  Fix potential NPE in manifest editor when switching SDKs
2009-10-20 16:13:50 -04:00
Raphael
4ed80aea34 Fix potential NPE in manifest editor when switching SDKs
The UiElementNode depends on the target to compute the
description and it's entirely possible for the target to
be null while the SDK is being unloaded/reloaded.

SDK BUG 2196260

Change-Id: I4151529ea3b6a65eade47d03e55fc93cad8596d9
2009-10-20 12:59:15 -07:00
Raphael
5708d1576b Android.bat: remove /O in xcopy.
It means "copy ownership". But on the Vista 64 box in the lab,
it make the xcopy of lib/x86/swt.jar fail the next time when it
was already present.

SDK BUG 2198636
2009-10-20 12:16:51 -07:00