Brett Chabot
b967fc6a77
am 3447c407: Merge change I8f6ac3c9 into eclair
...
Merge commit '3447c407dc70a365d6d7faade0f3725315d05e54' into eclair-plus-aosp
* commit '3447c407dc70a365d6d7faade0f3725315d05e54':
Refactor runtest test_defs to allow programmatic creation.
2009-10-22 11:13:52 -07:00
David 'Digit' Turner
b5cfac8cf3
am 9eff6cbf: Add OpenGL 2.0 headers and libraries to the NDK.
...
Merge commit '9eff6cbfaa210af0f5500f75576b457565cfafae' into eclair-plus-aosp
* commit '9eff6cbfaa210af0f5500f75576b457565cfafae':
Add OpenGL 2.0 headers and libraries to the NDK.
2009-10-22 11:13:21 -07:00
David 'Digit' Turner
bda1e9c3ea
am 975491c9: Add android-5 platform to the NDK.
...
Merge commit '975491c9ebb8ec659d96318df5f37f92c903f09f' into eclair-plus-aosp
* commit '975491c9ebb8ec659d96318df5f37f92c903f09f':
Add android-5 platform to the NDK.
2009-10-22 11:12:30 -07:00
Brett Chabot
434f8bd9fc
am 4ee04869: Merge change I12f05ef0 into eclair
...
Merge commit '4ee0486913f0a9a478e829ba33de2eb8bc6e8a49' into eclair-plus-aosp
* commit '4ee0486913f0a9a478e829ba33de2eb8bc6e8a49':
Add ability to retrieve instrumentations from android_manifest parser.
2009-10-22 11:12:25 -07:00
Raphael
c289bed4c0
am f6f2d37d: Merge change I03351f1b into eclair
...
Merge commit 'f6f2d37d9365ad1bfd53da2134eeed8604c36954' into eclair-plus-aosp
* commit 'f6f2d37d9365ad1bfd53da2134eeed8604c36954':
SDK Updater: switch UdpateChooserDialog to jface.
2009-10-22 11:12:11 -07:00
David 'Digit' Turner
2f739c316e
am b48ab640: Allow applications to target future API levels
...
Merge commit 'b48ab6402801d82ac205b34ffa1bc6787a0042b6' into eclair-plus-aosp
* commit 'b48ab6402801d82ac205b34ffa1bc6787a0042b6':
Allow applications to target future API levels
2009-10-22 11:12:05 -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 Git Automerger
ac7e406b42
Part 2 of 2 for merge of ec59a8834b to workaround a git issue
2009-10-21 18:05:55 -07:00
Android Git Automerger
1fac8037fb
Part 1 of 2 for merge of ec59a8834b to workaround a git issue
2009-10-21 18:00:34 -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
Brett Chabot
924c089879
Refactor runtest test_defs to allow programmatic creation.
...
Previously a test definition could only be created via xml.
Also fix some minor lint warnings.
2009-10-21 14:35:37 -07:00
David 'Digit' Turner
975491c9eb
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.
2009-10-21 14:31:53 -07:00
Android (Google) Code Review
4ee0486913
Merge change I12f05ef0 into eclair
...
* changes:
Add ability to retrieve instrumentations from android_manifest parser.
2009-10-21 17:26:32 -04:00
Android (Google) Code Review
f6f2d37d93
Merge change I03351f1b into eclair
...
* changes:
SDK Updater: switch UdpateChooserDialog to jface.
2009-10-21 17:19:40 -04:00
Raphael
46b5e20d2b
SDK Updater: switch UdpateChooserDialog to jface.
...
Change-Id: I03351f1b21b81d1654ce4ecb1c8ca5846f1fb7c4
2009-10-21 12:10:47 -07:00
Brett Chabot
34fb7f6b0c
Add ability to retrieve instrumentations from android_manifest parser.
...
Also add a simple unit test for the parser.
2009-10-21 11:19:12 -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
David 'Digit' Turner
561f5ba8df
am 6f605c32: Merge change If7aa22af into eclair
...
Merge commit '6f605c32adfe3ac23bb91f857fa89b9cb037237a' into eclair-plus-aosp
* commit '6f605c32adfe3ac23bb91f857fa89b9cb037237a':
Remove bash-ism from build-ndk-sysroot.sh
2009-10-20 16:25:37 -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
4b457f6ed5
am fb766f44: Merge change I898b43fe into eclair
...
Merge commit 'fb766f44a71f7b97610065fd1628652026f69880' into eclair-plus-aosp
* commit 'fb766f44a71f7b97610065fd1628652026f69880':
Refresh NDK C library headers for all platforms
2009-10-20 16:04:19 -07: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
Raphael
33edc96d1e
am e97d99d0: am d58cd1b5: Merge change I075d2eae into eclair-sdk
...
Merge commit 'e97d99d02c655d3fa2801bb81787a1aff2d36d99' into eclair-plus-aosp
* commit 'e97d99d02c655d3fa2801bb81787a1aff2d36d99':
SDK Updater: UI polish
2009-10-20 15:42:36 -07:00
Raphael
a4913107bc
am d75c03e4: am 7c1adfe7: Merge change I5b1f8bca into eclair-sdk
...
Merge commit 'd75c03e4f18b11ba6f13112be3232db6795ed0fe' into eclair-plus-aosp
* commit 'd75c03e4f18b11ba6f13112be3232db6795ed0fe':
AVD Manager: Properly disable AVD > Start > ? under Windows
2009-10-20 15:42:32 -07: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
Raphael
8d10fa07ec
am 90b60a39: am c9b04450: Merge change I4151529e into eclair-sdk
...
Merge commit '90b60a3985d07f6113d91737fcd37da2d282ce8f' into eclair-plus-aosp
* commit '90b60a3985d07f6113d91737fcd37da2d282ce8f':
Fix potential NPE in manifest editor when switching SDKs
2009-10-20 13:30:08 -07:00
Raphael
97050d6254
am bf2cc38e: am 5708d157: Android.bat: remove /O in xcopy.
...
Merge commit 'bf2cc38e5b2a30f2f0906f3f37ed767af092956d' into eclair-plus-aosp
* commit 'bf2cc38e5b2a30f2f0906f3f37ed767af092956d':
Android.bat: remove /O in xcopy.
2009-10-20 13:30:02 -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
Xavier Ducrohet
ae126fa926
am 302e013b: am fc5b5aec: Merge change I1a00abb0 into eclair-sdk
...
Merge commit '302e013b6a338fc9a7bbc4fa4fc68e0cb95bc38b' into eclair-plus-aosp
* commit '302e013b6a338fc9a7bbc4fa4fc68e0cb95bc38b':
Fix a deadlock when ADT starts, starts building projects, and load the SDK at the same time.
2009-10-19 14:46:51 -07:00
Xavier Ducrohet
302e013b6a
am fc5b5aec: Merge change I1a00abb0 into eclair-sdk
...
Merge commit 'fc5b5aecdeca8bb32eba9d38961b6649395f8913' into eclair
* commit 'fc5b5aecdeca8bb32eba9d38961b6649395f8913':
Fix a deadlock when ADT starts, starts building projects, and load the SDK at the same time.
2009-10-19 14:37:11 -07:00
Android (Google) Code Review
fc5b5aecde
Merge change I1a00abb0 into eclair-sdk
...
* changes:
Fix a deadlock when ADT starts, starts building projects, and load the SDK at the same time.
2009-10-19 17:24:34 -04:00
Xavier Ducrohet
1a00abb0ae
Fix a deadlock when ADT starts, starts building projects, and load the SDK at the same time.
2009-10-19 12:56:57 -07:00
Raphael
be169be7a5
am ea82bcc2: am 5cff81bb: (-s ours) SDK Updater: properly update/install doc. (do not merge)
...
Merge commit 'ea82bcc20b12af0ba72a12d7e178be413b806bfb' into eclair-plus-aosp
* commit 'ea82bcc20b12af0ba72a12d7e178be413b806bfb':
SDK Updater: properly update/install doc. (do not merge)
2009-10-16 18:08:15 -07:00
Xavier Ducrohet
12b291e18e
am 15549af0: am af496633: (-s ours) Add save/load for the user-made Layout Devices. (do not merge)
...
Merge commit '15549af01e6d1d62b56e825800191d223c4f29a2' into eclair-plus-aosp
* commit '15549af01e6d1d62b56e825800191d223c4f29a2':
Add save/load for the user-made Layout Devices. (do not merge)
2009-10-16 18:08:10 -07:00
Xavier Ducrohet
c6ada91589
am 81747d72: am 5e4efac4: (-s ours) WQVGA skin (240x400) (do not merge)
...
Merge commit '81747d726994d027d64652a6f6ee59d76427df31' into eclair-plus-aosp
* commit '81747d726994d027d64652a6f6ee59d76427df31':
WQVGA skin (240x400) (do not merge)
2009-10-16 18:08:06 -07:00
Raphael
b0cd32b1cb
am 2a13cc20: SDK Updater: properly update/install doc.
...
Merge commit '2a13cc201a9d8ca360b0a9b8ce16bac8cf165d60' into eclair-plus-aosp
* commit '2a13cc201a9d8ca360b0a9b8ce16bac8cf165d60':
SDK Updater: properly update/install doc.
2009-10-16 18:08:02 -07:00
Raphael
ea82bcc20b
am 5cff81bb: (-s ours) SDK Updater: properly update/install doc. (do not merge)
...
Merge commit '5cff81bb5878d00925cbab24822123f1feebbbb8' into eclair
* commit '5cff81bb5878d00925cbab24822123f1feebbbb8':
SDK Updater: properly update/install doc. (do not merge)
2009-10-16 17:57:18 -07:00