OSDN Git Service
Xavier Ducrohet [Tue, 3 Nov 2009 19:34:50 +0000 (11:34 -0800)]
am
f9e0b264: Move check for hidden files in the proper method.
Merge commit '
f9e0b264422d086066a9d9deb2118617735e8d65' into eclair-plus-aosp
* commit '
f9e0b264422d086066a9d9deb2118617735e8d65':
Move check for hidden files in the proper method.
Xavier Ducrohet [Tue, 3 Nov 2009 18:52:54 +0000 (10:52 -0800)]
Move check for hidden files in the proper method.
Change-Id: I0a364b118d60aaab259cba2b13edcc2c31c39148
Raphael [Tue, 3 Nov 2009 17:53:28 +0000 (09:53 -0800)]
am
8d700bdf: SDK: fix build. checkFileForPackaging is used by ApkBuilder.
Merge commit '
8d700bdf67681ad405819c06906325768f8cf9ea' into eclair-plus-aosp
* commit '
8d700bdf67681ad405819c06906325768f8cf9ea':
SDK: fix build. checkFileForPackaging is used by ApkBuilder.
Raphael [Tue, 3 Nov 2009 17:40:55 +0000 (09:40 -0800)]
SDK: fix build. checkFileForPackaging is used by ApkBuilder.
Change-Id: I91e9c63adcd6e069b1ec15627b95565c26cd3bc6
Reference: Change If0d0751e
SDK BUG
2233458
Xavier Ducrohet [Tue, 3 Nov 2009 07:17:02 +0000 (23:17 -0800)]
am
f31f6303: Merge change If0d0751e into eclair
Merge commit '
f31f630320a53e067ead2848d24ff63b0e0ad3b0' into eclair-plus-aosp
* commit '
f31f630320a53e067ead2848d24ff63b0e0ad3b0':
Ignore hidden files and vi swap files during packaging.
Android (Google) Code Review [Tue, 3 Nov 2009 07:06:32 +0000 (02:06 -0500)]
Merge change If0d0751e into eclair
* changes:
Ignore hidden files and vi swap files during packaging.
Xavier Ducrohet [Tue, 3 Nov 2009 02:31:46 +0000 (18:31 -0800)]
Ignore hidden files and vi swap files during packaging.
BUG #
2233458
Change-Id: If0d0751ed7b896a7803e9b69fb0e6bff97dd4330
Brett Chabot [Tue, 3 Nov 2009 01:14:54 +0000 (17:14 -0800)]
am
a9982898: Merge change Ida443c07 into eclair
Merge commit '
a9982898b33399ddeee1e97f5f0d18c77ec1d538' into eclair-plus-aosp
* commit '
a9982898b33399ddeee1e97f5f0d18c77ec1d538':
Remove calendar provider suite from continuous. DO NOT MERGE
Android (Google) Code Review [Tue, 3 Nov 2009 01:08:06 +0000 (20:08 -0500)]
Merge change Ida443c07 into eclair
* changes:
Remove calendar provider suite from continuous. DO NOT MERGE
Xavier Ducrohet [Mon, 2 Nov 2009 20:45:26 +0000 (12:45 -0800)]
am
208c7569: am
0dd85d89: (-s ours) Only apply permission to files with +x (do not merge)
Merge commit '
208c75697e483f63f6075f28c1fc4ff49382f884' into eclair-plus-aosp
* commit '
208c75697e483f63f6075f28c1fc4ff49382f884':
Only apply permission to files with +x (do not merge)
Xavier Ducrohet [Mon, 2 Nov 2009 20:34:39 +0000 (12:34 -0800)]
am
0dd85d89: (-s ours) Only apply permission to files with +x (do not merge)
Merge commit '
0dd85d89fa90de0d79da296292f75ceb5cf48b92' into eclair
* commit '
0dd85d89fa90de0d79da296292f75ceb5cf48b92':
Only apply permission to files with +x (do not merge)
Xavier Ducrohet [Fri, 30 Oct 2009 23:34:47 +0000 (16:34 -0700)]
Only apply permission to files with +x (do not merge)
integrated from eclair branch.
Xavier Ducrohet [Mon, 2 Nov 2009 19:48:52 +0000 (11:48 -0800)]
am
192d5db1: Merge change Ied3304a0 into eclair
Merge commit '
192d5db1fedef99404644256f80740bb3763b049' into eclair-plus-aosp
* commit '
192d5db1fedef99404644256f80740bb3763b049':
Only apply permission to files with +x
Android (Google) Code Review [Mon, 2 Nov 2009 19:40:10 +0000 (14:40 -0500)]
Merge change Ied3304a0 into eclair
* changes:
Only apply permission to files with +x
Brett Chabot [Sat, 31 Oct 2009 00:20:49 +0000 (17:20 -0700)]
Remove calendar provider suite from continuous. DO NOT MERGE
Bug
2171501
Xavier Ducrohet [Fri, 30 Oct 2009 23:34:47 +0000 (16:34 -0700)]
Only apply permission to files with +x
Change-Id: Ied3304a0f9687b601666c4ec7ce7a34157254d7c
Raphael [Fri, 30 Oct 2009 20:08:50 +0000 (13:08 -0700)]
am
8a370089: am
d3f9eb79: SDK Manager: Display error when saving settings
Merge commit '
8a370089b824f5acd97b5986b9b1e5bff3aefca4' into eclair-plus-aosp
* commit '
8a370089b824f5acd97b5986b9b1e5bff3aefca4':
SDK Manager: Display error when saving settings
Raphael [Fri, 30 Oct 2009 20:01:22 +0000 (13:01 -0700)]
am
d3f9eb79: SDK Manager: Display error when saving settings
Merge commit '
d3f9eb79c79752b76e483d5d6774b76bcf91a8de' into eclair
* commit '
d3f9eb79c79752b76e483d5d6774b76bcf91a8de':
SDK Manager: Display error when saving settings
Raphael [Fri, 30 Oct 2009 04:20:41 +0000 (21:20 -0700)]
SDK Manager: Display error when saving settings
SDK BUG
2226029
Change-Id: I568c71b80bddb5c4409df0bd1b02e35b82d6d1ba
Dmitri Plotnikov [Thu, 29 Oct 2009 21:57:30 +0000 (14:57 -0700)]
am
41c271bb: Merge change Iae0bc856 into eclair
Merge commit '
41c271bb20ca14031405bda11e9dfd4b7bbc8a60' into eclair-plus-aosp
* commit '
41c271bb20ca14031405bda11e9dfd4b7bbc8a60':
A sample application that demonstrates use of legacy and current contacts APIs.
Android (Google) Code Review [Thu, 29 Oct 2009 21:49:26 +0000 (17:49 -0400)]
Merge change Iae0bc856 into eclair
* changes:
A sample application that demonstrates use of legacy and current contacts APIs.
Raphael [Thu, 29 Oct 2009 21:41:10 +0000 (14:41 -0700)]
am
7a42c8f4: am
be4cbcc2: SDK Manager: fix NPE in AVD > Start when there\'s no skin name.
Merge commit '
7a42c8f4d58306dfd2aa14d7d3ee52ebb54a19ae' into eclair-plus-aosp
* commit '
7a42c8f4d58306dfd2aa14d7d3ee52ebb54a19ae':
SDK Manager: fix NPE in AVD > Start when there's no skin name.
Brett Chabot [Thu, 29 Oct 2009 21:41:04 +0000 (14:41 -0700)]
am
da78534e: Merge change Ia94518e3 into eclair
Merge commit '
da78534e3aefa41c7b76f6570cfcd7cea296325c' into eclair-plus-aosp
* commit '
da78534e3aefa41c7b76f6570cfcd7cea296325c':
ADT test fixes.
Raphael [Thu, 29 Oct 2009 21:31:05 +0000 (14:31 -0700)]
am
be4cbcc2: SDK Manager: fix NPE in AVD > Start when there\'s no skin name.
Merge commit '
be4cbcc2267e3778776c68785b52f871f72c67f7' into eclair
* commit '
be4cbcc2267e3778776c68785b52f871f72c67f7':
SDK Manager: fix NPE in AVD > Start when there's no skin name.
Dmitri Plotnikov [Thu, 29 Oct 2009 01:36:32 +0000 (18:36 -0700)]
A sample application that demonstrates use of legacy and current contacts APIs.
The application provides two implementations for access to contacts, one based
on legacy API, the other based on the current API. The correct implementation
is chosen at runtime based on the version of the SDK.
Change-Id: Iae0bc8564be420ff504a5dc760b935630a7664e6
Raphael [Thu, 29 Oct 2009 20:52:56 +0000 (13:52 -0700)]
SDK Manager: fix NPE in AVD > Start when there's no skin name.
Also log missing config.ini path.
SDK BUG
2223760
Change-Id: I4517005e03e90c0b5a52bcb40b0d32eddd03c1f3
Android (Google) Code Review [Thu, 29 Oct 2009 20:45:53 +0000 (16:45 -0400)]
Merge change Ia94518e3 into eclair
* changes:
ADT test fixes.
Raphael [Thu, 29 Oct 2009 20:41:32 +0000 (13:41 -0700)]
am
aad90b62: am
940073e2: (-s ours) Merge change I28aa1104 into eclair-sdk
Merge commit '
aad90b62c73e6d44ed391fb24953021d0b45a768' into eclair-plus-aosp
* commit '
aad90b62c73e6d44ed391fb24953021d0b45a768':
SDK Updater: don't load sdk-repo XML that failed to validate. DO NOT MERGE.
Raphael [Thu, 29 Oct 2009 20:41:26 +0000 (13:41 -0700)]
am
1a29f28e: am
dd77d69f: (-s ours) Merge change I6b97fee0 into eclair-sdk
Merge commit '
1a29f28e13c32fd8e62f08677c23d1d37644dd43' into eclair-plus-aosp
* commit '
1a29f28e13c32fd8e62f08677c23d1d37644dd43':
SDK Manager > AVD > Start: print computed scale. DO NOT MERGE.
Raphael [Thu, 29 Oct 2009 20:30:46 +0000 (13:30 -0700)]
am
940073e2: (-s ours) Merge change I28aa1104 into eclair-sdk
Merge commit '
940073e267695a7c4a404cb2174b48e893c15a45' into eclair
* commit '
940073e267695a7c4a404cb2174b48e893c15a45':
SDK Updater: don't load sdk-repo XML that failed to validate. DO NOT MERGE.
Raphael [Thu, 29 Oct 2009 20:30:39 +0000 (13:30 -0700)]
am
dd77d69f: (-s ours) Merge change I6b97fee0 into eclair-sdk
Merge commit '
dd77d69f9e8eca2bd81f418f867d1b4b3bd6462e' into eclair
* commit '
dd77d69f9e8eca2bd81f418f867d1b4b3bd6462e':
SDK Manager > AVD > Start: print computed scale. DO NOT MERGE.
Android (Google) Code Review [Thu, 29 Oct 2009 20:22:26 +0000 (16:22 -0400)]
Merge change I28aa1104 into eclair-sdk
* changes:
SDK Updater: don't load sdk-repo XML that failed to validate. DO NOT MERGE.
Xavier Ducrohet [Thu, 29 Oct 2009 20:19:58 +0000 (13:19 -0700)]
am
8d7fa52a: am
3c5557bb: Merge change Idd4c6e5f into eclair-sdk
Merge commit '
8d7fa52af11670e2640b12466cc094960f0455b1' into eclair-plus-aosp
* commit '
8d7fa52af11670e2640b12466cc094960f0455b1':
Move SDK tools package to r4
Android (Google) Code Review [Thu, 29 Oct 2009 20:14:35 +0000 (16:14 -0400)]
Merge change I6b97fee0 into eclair-sdk
* changes:
SDK Manager > AVD > Start: print computed scale. DO NOT MERGE.
Xavier Ducrohet [Thu, 29 Oct 2009 20:09:24 +0000 (13:09 -0700)]
am
3c5557bb: Merge change Idd4c6e5f into eclair-sdk
Merge commit '
3c5557bb5e9235737c4c7ddda4c66f14396105cf' into eclair
* commit '
3c5557bb5e9235737c4c7ddda4c66f14396105cf':
Move SDK tools package to r4
Android (Google) Code Review [Thu, 29 Oct 2009 20:00:32 +0000 (16:00 -0400)]
Merge change Idd4c6e5f into eclair-sdk
* changes:
Move SDK tools package to r4
Raphael [Thu, 29 Oct 2009 20:00:11 +0000 (13:00 -0700)]
SDK Manager > AVD > Start: print computed scale. DO NOT MERGE.
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: I6b97fee06bd4e6dc36c977ffef3c25315469b766
Raphael [Thu, 29 Oct 2009 19:56:16 +0000 (12:56 -0700)]
SDK Updater: don't load sdk-repo XML that failed to validate. DO NOT MERGE.
This also prints a more obvious message in case Java doesn't
have an XML Schema validator.
SDK BUGS
2219284 2198427
Change-Id: I28aa1104957d2fe7791dcf0377a42d37f777a19d
Xavier Ducrohet [Thu, 29 Oct 2009 19:47:19 +0000 (12:47 -0700)]
am
f7f145dc: am
275de810: Merge change I2089d86d into eclair-sdk
Merge commit '
f7f145dc0443ffa396304c2547ff9c15638c4dad' into eclair-plus-aosp
* commit '
f7f145dc0443ffa396304c2547ff9c15638c4dad':
Fix the android launcher script to not force Java 1.5 on MacOS
Xavier Ducrohet [Thu, 29 Oct 2009 19:39:03 +0000 (12:39 -0700)]
am
275de810: Merge change I2089d86d into eclair-sdk
Merge commit '
275de810e99814cefd11321fd934bda1a4b53cc9' into eclair
* commit '
275de810e99814cefd11321fd934bda1a4b53cc9':
Fix the android launcher script to not force Java 1.5 on MacOS
Android (Google) Code Review [Thu, 29 Oct 2009 19:28:07 +0000 (15:28 -0400)]
Merge change I2089d86d into eclair-sdk
* changes:
Fix the android launcher script to not force Java 1.5 on MacOS
Xavier Ducrohet [Thu, 29 Oct 2009 19:27:50 +0000 (12:27 -0700)]
Move SDK tools package to r4
Xavier Ducrohet [Thu, 29 Oct 2009 18:40:20 +0000 (11:40 -0700)]
Fix the android launcher script to not force Java 1.5 on MacOS
Brett Chabot [Thu, 29 Oct 2009 01:22:15 +0000 (18:22 -0700)]
ADT test fixes.
Temporarily remove SampleProjectTest from continuous, since its failing at
every CL.
Adjust ApiDemosRenderingTest to use the SDK loaded by ADT.
Remove SdkEnvTestCase since it doesn't work in all situations.
Fix test data lookup for NinePatchTest and BridgeXmlBlockParserTest.
Bugs
2222616,
2218682
Raphael [Wed, 28 Oct 2009 01:05:55 +0000 (18:05 -0700)]
am
107b1a9e: Merge change Ie496edfa into eclair
Merge commit '
107b1a9ee6c8e96027bec7a0caf16f723efd39ce' into eclair-plus-aosp
* commit '
107b1a9ee6c8e96027bec7a0caf16f723efd39ce':
SDK Updater: don't load sdk-repo XML that failed to validate.
Android (Google) Code Review [Wed, 28 Oct 2009 00:57:02 +0000 (20:57 -0400)]
Merge change Ie496edfa into eclair
* changes:
SDK Updater: don't load sdk-repo XML that failed to validate.
Raphael [Tue, 27 Oct 2009 22:28:34 +0000 (15:28 -0700)]
SDK Updater: don't load sdk-repo XML that failed to validate.
This also prints a more obvious message in case Java doesn't
have an XML Schema validator.
SDK BUGS
2219284 2198427
Change-Id: Ie496edfa7f0ca2802a537a7c6e84a88f177991a9
Raphael [Wed, 28 Oct 2009 00:44:42 +0000 (17:44 -0700)]
am
09c5201a: Prepare version numbers for next SDK & tools
Merge commit '
09c5201adca0ceb0e881832d53cfa9e412d07389' into eclair-plus-aosp
* commit '
09c5201adca0ceb0e881832d53cfa9e412d07389':
Prepare version numbers for next SDK & tools
Raphael [Tue, 27 Oct 2009 22:33:17 +0000 (15:33 -0700)]
Prepare version numbers for next SDK & tools
Change-Id: I8e57df22462ec3e14e0f119b57999c208bb9d1fd
Brett Chabot [Tue, 27 Oct 2009 01:06:00 +0000 (18:06 -0700)]
am
0c62341e: Merge change I3778cb73 into eclair
Merge commit '
0c62341e8ec194a18bbf35fb380287c15d2da70d' into eclair-plus-aosp
* commit '
0c62341e8ec194a18bbf35fb380287c15d2da70d':
Fix runcommand logging exception.
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
Raphael [Mon, 26 Oct 2009 23:25:40 +0000 (16:25 -0700)]
am
b3bca018: Merge change I337b2644 into eclair
Merge commit '
b3bca018783a0621b981ec8eb98dbbd15f450677' into eclair-plus-aosp
* commit '
b3bca018783a0621b981ec8eb98dbbd15f450677':
SDK Manager > AVD > Start: print computed scale.
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.
Xavier Ducrohet [Mon, 26 Oct 2009 21:25:34 +0000 (14:25 -0700)]
am
a73e4f9a: Merge change I7f60270f into eclair
Merge commit '
a73e4f9af7cafc9db6331ab0522c27bf75b2c3b2' into eclair-plus-aosp
* commit '
a73e4f9af7cafc9db6331ab0522c27bf75b2c3b2':
ADT/GEL: Reenable config popup when switching from a device with only 1 config
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
Brett Chabot [Mon, 26 Oct 2009 21:14:50 +0000 (14:14 -0700)]
am
3777f090: Merge change I25e7415f into eclair
Merge commit '
3777f090a3a187bc251705028fe8cb019400e330' into eclair-plus-aosp
* commit '
3777f090a3a187bc251705028fe8cb019400e330':
Add runtest --path.
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
Raphael [Fri, 23 Oct 2009 20:56:41 +0000 (13:56 -0700)]
am
e7ff49b8: SDK Manager: properly reset tree when changing updates only
Merge commit '
e7ff49b82da151037ef5f221a95b95c897deab30' into eclair-plus-aosp
* 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 00:46:15 +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-plus-aosp
* 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:12:43 +0000 (14:12 -0700)]
am
cdfea21f: Merge change Ie00595bd into eclair
Merge commit '
cdfea21f9285641d3040d4fb19138873086c9869' into eclair-plus-aosp
* 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:31:04 +0000 (11:31 -0700)]
am
52508ffa: am
aa95bfe2: doc change only: update gae python server script (tested)
Merge commit '
52508ffa962b1fd9a47899b83e2e9106eac5b14d' into eclair-plus-aosp
* commit '
52508ffa962b1fd9a47899b83e2e9106eac5b14d':
doc change only: update gae python server script (tested)
Raphael [Thu, 22 Oct 2009 18:31:00 +0000 (11:31 -0700)]
am
a16a134a: am
5d2a01ad: Merge change I235da4a8 into eclair-sdk
Merge commit '
a16a134a865b4e894c6667cb5b6d9e635baa53f2' into eclair-plus-aosp
* 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:14:56 +0000 (11:14 -0700)]
am
1cd61741: Add support to run only tests in a given java package.
Merge commit '
1cd617413095758758beef03e3f45d26e9ad7751' into eclair-plus-aosp
* commit '
1cd617413095758758beef03e3f45d26e9ad7751':
Add support to run only tests in a given java package.
Brett Chabot [Thu, 22 Oct 2009 18:13:52 +0000 (11:13 -0700)]
am
3447c407: Merge change I8f6ac3c9 into eclair
Merge commit '
3447c407dc70a365d6d7faade0f3725315d05e54' into eclair-plus-aosp
* commit '
3447c407dc70a365d6d7faade0f3725315d05e54':
Refactor runtest test_defs to allow programmatic creation.
David 'Digit' Turner [Thu, 22 Oct 2009 18:13:21 +0000 (11:13 -0700)]
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.
David 'Digit' Turner [Thu, 22 Oct 2009 18:12:30 +0000 (11:12 -0700)]
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.
Brett Chabot [Thu, 22 Oct 2009 18:12:25 +0000 (11:12 -0700)]
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.
Raphael [Thu, 22 Oct 2009 18:12:11 +0000 (11:12 -0700)]
am
f6f2d37d: Merge change I03351f1b into eclair
Merge commit '
f6f2d37d9365ad1bfd53da2134eeed8604c36954' into eclair-plus-aosp
* commit '
f6f2d37d9365ad1bfd53da2134eeed8604c36954':
SDK Updater: switch UdpateChooserDialog to jface.
David 'Digit' Turner [Thu, 22 Oct 2009 18:12:05 +0000 (11:12 -0700)]
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
Android Git Automerger [Thu, 22 Oct 2009 17:53:06 +0000 (10:53 -0700)]
Previously merged by hand, now empty merge commit '
ec59a8834bbca256495045a6687a672f66b52df0' into eclair-plus-aosp
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)
Android Git Automerger [Thu, 22 Oct 2009 01:05:55 +0000 (18:05 -0700)]
Part 2 of 2 for merge of
ec59a8834bbca256495045a6687a672f66b52df0 to workaround a git issue
Android Git Automerger [Thu, 22 Oct 2009 01:00:34 +0000 (18:00 -0700)]
Part 1 of 2 for merge of
ec59a8834bbca256495045a6687a672f66b52df0 to workaround a git issue
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.
Android (Google) Code Review [Wed, 21 Oct 2009 21:19:40 +0000 (17:19 -0400)]
Merge change I03351f1b into eclair
* changes:
SDK Updater: switch UdpateChooserDialog to jface.
Android (Google) Code Review [Wed, 21 Oct 2009 20:09:28 +0000 (16:09 -0400)]
Merge change I235da4a8 into eclair-sdk
* changes:
SDK android "update project" must not require --target parameter.
Raphael [Wed, 21 Oct 2009 19:30:21 +0000 (12:30 -0700)]
SDK android "update project" must not require --target parameter.
SDK BUG
2203846
Change-Id: I235da4a8892de9a4334d5630667484220472f168
Raphael [Wed, 21 Oct 2009 05:14:03 +0000 (22:14 -0700)]
SDK Updater: switch UdpateChooserDialog to jface.
Change-Id: I03351f1b21b81d1654ce4ecb1c8ca5846f1fb7c4
Brett Chabot [Wed, 21 Oct 2009 18:16:42 +0000 (11:16 -0700)]
Add ability to retrieve instrumentations from android_manifest parser.
Also add a simple unit test for the parser.
David 'Digit' Turner [Wed, 21 Oct 2009 00:51:19 +0000 (17:51 -0700)]
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).
David 'Digit' Turner [Tue, 20 Oct 2009 23:25:37 +0000 (16:25 -0700)]
am
6f605c32: Merge change If7aa22af into eclair
Merge commit '
6f605c32adfe3ac23bb91f857fa89b9cb037237a' into eclair-plus-aosp
* commit '
6f605c32adfe3ac23bb91f857fa89b9cb037237a':
Remove bash-ism from build-ndk-sysroot.sh
Android (Google) Code Review [Tue, 20 Oct 2009 23:23:59 +0000 (19:23 -0400)]
Merge change I31f23a0b into eclair
* changes:
Remove build/platforms/android-*/common directories.
Android (Google) Code Review [Tue, 20 Oct 2009 23:18:07 +0000 (19:18 -0400)]
Merge change If7aa22af into eclair
* changes:
Remove bash-ism from build-ndk-sysroot.sh
David 'Digit' Turner [Tue, 20 Oct 2009 23:04:19 +0000 (16:04 -0700)]
am
fb766f44: Merge change I898b43fe into eclair
Merge commit '
fb766f44a71f7b97610065fd1628652026f69880' into eclair-plus-aosp
* commit '
fb766f44a71f7b97610065fd1628652026f69880':
Refresh NDK C library headers for all platforms
David 'Digit' Turner [Tue, 20 Oct 2009 22:53:42 +0000 (15:53 -0700)]
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.