OSDN Git Service

android-x86/ndk.git
14 years agoam 97d2521e: am b06a8a0c: am 5c52358c: Merge change I8404ae5f into eclair
Xavier Ducrohet [Thu, 3 Dec 2009 04:37:50 +0000 (20:37 -0800)]
am 97d2521e: am b06a8a0c: am 5c52358c: Merge change I8404ae5f into eclair

Merge commit '97d2521e67df9ce745fa39a88ca3ec5bfe580d33'

* commit '97d2521e67df9ce745fa39a88ca3ec5bfe580d33':
  Move some scripts that were in development/tools/scripts back in this project

14 years agoam ac986b0d: am 6be8bb5f: am 86cd8059: Merge change Ia7f1d23e into eclair
Xavier Ducrohet [Thu, 3 Dec 2009 04:37:46 +0000 (20:37 -0800)]
am ac986b0d: am 6be8bb5f: am 86cd8059: Merge change Ia7f1d23e into eclair

Merge commit 'ac986b0d117a72482b8490a9c84b56d2c239da49'

* commit 'ac986b0d117a72482b8490a9c84b56d2c239da49':
  Update sdk build to use the new folders in sdk/

14 years agoam 1d46eb30: am 7271d158: am bc9cac17: Make Gesturebuilder build like a sample.
Xavier Ducrohet [Thu, 3 Dec 2009 04:30:05 +0000 (20:30 -0800)]
am 1d46eb30: am 7271d158: am bc9cac17: Make Gesturebuilder build like a sample.

Merge commit '1d46eb3093723d509e45d33f65676dc3fd8f0360'

* commit '1d46eb3093723d509e45d33f65676dc3fd8f0360':
  Make Gesturebuilder build like a sample.

14 years agoam b06a8a0c: am 5c52358c: Merge change I8404ae5f into eclair
Xavier Ducrohet [Wed, 2 Dec 2009 21:13:05 +0000 (13:13 -0800)]
am b06a8a0c: am 5c52358c: Merge change I8404ae5f into eclair

Merge commit 'b06a8a0ca04d7900042410b4be0cf9cdfda24f18' into eclair-mr2-plus-aosp

* commit 'b06a8a0ca04d7900042410b4be0cf9cdfda24f18':
  Move some scripts that were in development/tools/scripts back in this project

14 years agoam 6be8bb5f: am 86cd8059: Merge change Ia7f1d23e into eclair
Xavier Ducrohet [Wed, 2 Dec 2009 21:13:01 +0000 (13:13 -0800)]
am 6be8bb5f: am 86cd8059: Merge change Ia7f1d23e into eclair

Merge commit '6be8bb5f2a3d59805419db427124ec0cca34c996' into eclair-mr2-plus-aosp

* commit '6be8bb5f2a3d59805419db427124ec0cca34c996':
  Update sdk build to use the new folders in sdk/

14 years agoam 5c52358c: Merge change I8404ae5f into eclair
Xavier Ducrohet [Wed, 2 Dec 2009 21:05:27 +0000 (13:05 -0800)]
am 5c52358c: Merge change I8404ae5f into eclair

Merge commit '5c52358c9b0a95adc0fe8b383289e7e522b2c421' into eclair-mr2

* commit '5c52358c9b0a95adc0fe8b383289e7e522b2c421':
  Move some scripts that were in development/tools/scripts back in this project

14 years agoam 86cd8059: Merge change Ia7f1d23e into eclair
Xavier Ducrohet [Wed, 2 Dec 2009 21:05:21 +0000 (13:05 -0800)]
am 86cd8059: Merge change Ia7f1d23e into eclair

Merge commit '86cd8059dec97e2c1f1797d1e179719561d05162' into eclair-mr2

* commit '86cd8059dec97e2c1f1797d1e179719561d05162':
  Update sdk build to use the new folders in sdk/

14 years agoMerge change I8404ae5f into eclair
Android (Google) Code Review [Wed, 2 Dec 2009 21:00:08 +0000 (13:00 -0800)]
Merge change I8404ae5f into eclair

* changes:
  Move some scripts that were in development/tools/scripts back in this project

14 years agoMerge change Ia7f1d23e into eclair
Android (Google) Code Review [Wed, 2 Dec 2009 20:59:48 +0000 (12:59 -0800)]
Merge change Ia7f1d23e into eclair

* changes:
  Update sdk build to use the new folders in sdk/

14 years agoam 7271d158: am bc9cac17: Make Gesturebuilder build like a sample.
Xavier Ducrohet [Wed, 2 Dec 2009 18:01:09 +0000 (10:01 -0800)]
am 7271d158: am bc9cac17: Make Gesturebuilder build like a sample.

Merge commit '7271d15820302b982f1f704661ff78ac094096b5' into eclair-mr2-plus-aosp

* commit '7271d15820302b982f1f704661ff78ac094096b5':
  Make Gesturebuilder build like a sample.

14 years agoam bc9cac17: Make Gesturebuilder build like a sample.
Xavier Ducrohet [Wed, 2 Dec 2009 17:48:15 +0000 (09:48 -0800)]
am bc9cac17: Make Gesturebuilder build like a sample.

Merge commit 'bc9cac171505afbf4ecdb5eabb849c98cac1bddc' into eclair-mr2

* commit 'bc9cac171505afbf4ecdb5eabb849c98cac1bddc':
  Make Gesturebuilder build like a sample.

14 years agoMake Gesturebuilder build like a sample.
Xavier Ducrohet [Wed, 2 Dec 2009 02:31:34 +0000 (18:31 -0800)]
Make Gesturebuilder build like a sample.

Change-Id: I42f097fbb46631de9bb088d7aeade971480c72ae

14 years agoam 7bd36462: am c46a762e: am eb3547b3: Add API demo for services that run in the...
Dianne Hackborn [Wed, 2 Dec 2009 01:34:28 +0000 (17:34 -0800)]
am 7bd36462: am c46a762e: am eb3547b3: Add API demo for services that run in the foreground.

Merge commit '7bd364622b5204f46c9a7e4e9bc3692c755b7de4'

* commit '7bd364622b5204f46c9a7e4e9bc3692c755b7de4':
  Add API demo for services that run in the foreground.

14 years agoam c20e78e0: am 4c959175: add one script to make release keys
Doug Zongker [Wed, 2 Dec 2009 01:34:22 +0000 (17:34 -0800)]
am c20e78e0: am 4c959175: add one script to make release keys

Merge commit 'c20e78e01526f550b3617aebef925b2eadfe1951'

* commit 'c20e78e01526f550b3617aebef925b2eadfe1951':
  add one script to make release keys

14 years agoam c46a762e: am eb3547b3: Add API demo for services that run in the foreground.
Dianne Hackborn [Wed, 2 Dec 2009 01:24:06 +0000 (17:24 -0800)]
am c46a762e: am eb3547b3: Add API demo for services that run in the foreground.

Merge commit 'c46a762ee35b8630ed9f824e0627566fe7cfe605' into eclair-mr2-plus-aosp

* commit 'c46a762ee35b8630ed9f824e0627566fe7cfe605':
  Add API demo for services that run in the foreground.

14 years agoam 4c959175: add one script to make release keys
Doug Zongker [Wed, 2 Dec 2009 01:24:00 +0000 (17:24 -0800)]
am 4c959175: add one script to make release keys

Merge commit '4c95917590d1a992b7fe8f6e703353fdf5a0bf3c' into eclair-mr2-plus-aosp

* commit '4c95917590d1a992b7fe8f6e703353fdf5a0bf3c':
  add one script to make release keys

14 years agoam eb3547b3: Add API demo for services that run in the foreground.
Dianne Hackborn [Wed, 2 Dec 2009 01:05:18 +0000 (17:05 -0800)]
am eb3547b3: Add API demo for services that run in the foreground.

Merge commit 'eb3547b3d0678ad16a602d342cf81dc64e03d9b7' into eclair-mr2

* commit 'eb3547b3d0678ad16a602d342cf81dc64e03d9b7':
  Add API demo for services that run in the foreground.

14 years agoUpdate sdk build to use the new folders in sdk/
Xavier Ducrohet [Tue, 1 Dec 2009 21:20:59 +0000 (13:20 -0800)]
Update sdk build to use the new folders in sdk/

Change-Id: Ia7f1d23e452b4b493dc4456f8fedd4dd3d2b006f

14 years agoMove some scripts that were in development/tools/scripts back in this project
Xavier Ducrohet [Tue, 1 Dec 2009 21:03:49 +0000 (13:03 -0800)]
Move some scripts that were in development/tools/scripts back in this project

They were moved into sdk/scripts when sdk was split from development.

Change-Id: I8404ae5fdeb9060adb76357f29b42c4c8e2054ee

14 years agoadd one script to make release keys
Doug Zongker [Tue, 1 Dec 2009 20:26:51 +0000 (12:26 -0800)]
add one script to make release keys

This script can replace the copies of mkkey.sh sprinkled all over the
tree.  It prompts nicely for passwords, avoids writing the raw private
key to disk, and always generates certs that use sha1WithRSAEncryption.

14 years agoam bd2ced11: am 51cce58c: Ensure the plugin\'s native code is never called with an...
Derek Sollenberger [Tue, 1 Dec 2009 17:14:50 +0000 (09:14 -0800)]
am bd2ced11: am 51cce58c: Ensure the plugin\'s native code is never called with an invalid NPP pointer.

Merge commit 'bd2ced1184a498fe5e6d93e780707e99971a0216'

* commit 'bd2ced1184a498fe5e6d93e780707e99971a0216':
  Ensure the plugin's native code is never called with an invalid NPP pointer.

14 years agoam 621b6bfa: am e62ce17a: Refactoring the logging interface to remove dependence...
Derek Sollenberger [Tue, 1 Dec 2009 17:14:07 +0000 (09:14 -0800)]
am 621b6bfa: am e62ce17a: Refactoring the logging interface to remove dependence on NPP.

Merge commit '621b6bfad10237b0ed3fdcb31a141df1dd7b8916'

* commit '621b6bfad10237b0ed3fdcb31a141df1dd7b8916':
  Refactoring the logging interface to remove dependence on NPP.

14 years agoam 51cce58c: Ensure the plugin\'s native code is never called with an invalid NPP...
Derek Sollenberger [Tue, 1 Dec 2009 14:13:40 +0000 (06:13 -0800)]
am 51cce58c: Ensure the plugin\'s native code is never called with an invalid NPP pointer.

Merge commit '51cce58c45591fdf3d0cd59a92aeb18182eaeded' into eclair-mr2-plus-aosp

* commit '51cce58c45591fdf3d0cd59a92aeb18182eaeded':
  Ensure the plugin's native code is never called with an invalid NPP pointer.

14 years agoEnsure the plugin's native code is never called with an invalid NPP pointer.
Derek Sollenberger [Tue, 1 Dec 2009 13:26:20 +0000 (08:26 -0500)]
Ensure the plugin's native code is never called with an invalid NPP pointer.

14 years agoam e62ce17a: Refactoring the logging interface to remove dependence on NPP.
Derek Sollenberger [Tue, 1 Dec 2009 13:22:25 +0000 (05:22 -0800)]
am e62ce17a: Refactoring the logging interface to remove dependence on NPP.

Merge commit 'e62ce17ac9726d6c169d5378db6027b2d8a16fcc' into eclair-mr2-plus-aosp

* commit 'e62ce17ac9726d6c169d5378db6027b2d8a16fcc':
  Refactoring the logging interface to remove dependence on NPP.

14 years agoMerge change Ifbc44116
Android (Google) Code Review [Tue, 1 Dec 2009 00:07:10 +0000 (16:07 -0800)]
Merge change Ifbc44116

* changes:
  Add OpenGL ES 2.0 sample.

14 years agoRefactoring the logging interface to remove dependence on NPP.
Derek Sollenberger [Mon, 30 Nov 2009 16:52:06 +0000 (11:52 -0500)]
Refactoring the logging interface to remove dependence on NPP.

14 years agoam b6fd8a3f: am 04b3e9a6: Refactoring sample plugin to use updated java interfaces.
Derek Sollenberger [Mon, 30 Nov 2009 15:59:58 +0000 (07:59 -0800)]
am b6fd8a3f: am 04b3e9a6: Refactoring sample plugin to use updated java interfaces.

Merge commit 'b6fd8a3fe7306b4d94ef7a11acb1d068e6e25d0e'

* commit 'b6fd8a3fe7306b4d94ef7a11acb1d068e6e25d0e':
  Refactoring sample plugin to use updated java interfaces.

14 years agoam 04b3e9a6: Refactoring sample plugin to use updated java interfaces.
Derek Sollenberger [Mon, 30 Nov 2009 15:55:30 +0000 (07:55 -0800)]
am 04b3e9a6: Refactoring sample plugin to use updated java interfaces.

Merge commit '04b3e9a6c6cf43887e9551ea1da7681f071b8696' into eclair-mr2-plus-aosp

* commit '04b3e9a6c6cf43887e9551ea1da7681f071b8696':
  Refactoring sample plugin to use updated java interfaces.

14 years agoRefactoring sample plugin to use updated java interfaces.
Derek Sollenberger [Tue, 24 Nov 2009 19:50:55 +0000 (14:50 -0500)]
Refactoring sample plugin to use updated java interfaces.

14 years agoAdd OpenGL ES 2.0 sample.
Jack Palevich [Fri, 27 Nov 2009 11:54:46 +0000 (19:54 +0800)]
Add OpenGL ES 2.0 sample.

This sample renders a textured triangle using OpenGL ES 2.0.

If OpenGL ES 2.0 is not available, the sample falls back to
using OpenGL ES 1.0.

14 years agoAdd API demo for services that run in the foreground.
Dianne Hackborn [Thu, 26 Nov 2009 00:40:52 +0000 (16:40 -0800)]
Add API demo for services that run in the foreground.

Change-Id: I7acb0817e5d738294bef02ca2df3c2ab18b45f60

14 years agoam 140e10cf: am 2171d57c: Merge change I6f2fcdd7 into eclair-mr2
Andrew Stadler [Wed, 25 Nov 2009 00:17:22 +0000 (16:17 -0800)]
am 140e10cf: am 2171d57c: Merge change I6f2fcdd7 into eclair-mr2

Merge commit '140e10cfae201688bc10f67ad12c989b67f60b3c'

* commit '140e10cfae201688bc10f67ad12c989b67f60b3c':
  Fix eclipse default .classpath

14 years agoam 2171d57c: Merge change I6f2fcdd7 into eclair-mr2
Andrew Stadler [Wed, 25 Nov 2009 00:13:55 +0000 (16:13 -0800)]
am 2171d57c: Merge change I6f2fcdd7 into eclair-mr2

Merge commit '2171d57cfcc25e7db63b4ae0a852504bdd3c507e' into eclair-mr2-plus-aosp

* commit '2171d57cfcc25e7db63b4ae0a852504bdd3c507e':
  Fix eclipse default .classpath

14 years agoMerge change I6f2fcdd7 into eclair-mr2
Android (Google) Code Review [Wed, 25 Nov 2009 00:08:54 +0000 (16:08 -0800)]
Merge change I6f2fcdd7 into eclair-mr2

* changes:
  Fix eclipse default .classpath

14 years agoFix eclipse default .classpath
Andrew Stadler [Tue, 24 Nov 2009 21:50:26 +0000 (13:50 -0800)]
Fix eclipse default .classpath

* Add frameworks/base/common/java
* Remove external/googleclient/googleclient-lib.jar

14 years agoam 014d368c: am 4b4129d3: am cc09e088: Merge change Icb96cddc into eclair
David 'Digit' Turner [Tue, 24 Nov 2009 01:12:25 +0000 (17:12 -0800)]
am 014d368c: am 4b4129d3: am cc09e088: Merge change Icb96cddc into eclair

Merge commit '014d368c389cfeb29aeb59448696cf08a6d8c47a'

* commit '014d368c389cfeb29aeb59448696cf08a6d8c47a':
  Cleanup installed binaries before the NDK build begins.

14 years agoam f7c5f462: am 78cab803: am 0d6684c8: Merge change I44da0c8f into eclair
Eric Fischer [Tue, 24 Nov 2009 01:12:21 +0000 (17:12 -0800)]
am f7c5f462: am 78cab803: am 0d6684c8: Merge change I44da0c8f into eclair

Merge commit 'f7c5f462dd904a00d7d0bfb7e4cb300798592cdf'

* commit 'f7c5f462dd904a00d7d0bfb7e4cb300798592cdf':
  Correct the raw offsets in the time zone index for a few zones.

14 years agoam 4b4129d3: am cc09e088: Merge change Icb96cddc into eclair
David 'Digit' Turner [Tue, 24 Nov 2009 01:08:16 +0000 (17:08 -0800)]
am 4b4129d3: am cc09e088: Merge change Icb96cddc into eclair

Merge commit '4b4129d30c75ab58f2ff9cb0696e894fde2b144b' into eclair-mr2-plus-aosp

* commit '4b4129d30c75ab58f2ff9cb0696e894fde2b144b':
  Cleanup installed binaries before the NDK build begins.

14 years agoam 78cab803: am 0d6684c8: Merge change I44da0c8f into eclair
Eric Fischer [Tue, 24 Nov 2009 01:08:12 +0000 (17:08 -0800)]
am 78cab803: am 0d6684c8: Merge change I44da0c8f into eclair

Merge commit '78cab8038a79f1e42e42b17b0ff180e676653e31' into eclair-mr2-plus-aosp

* commit '78cab8038a79f1e42e42b17b0ff180e676653e31':
  Correct the raw offsets in the time zone index for a few zones.

14 years agoam cc09e088: Merge change Icb96cddc into eclair
David 'Digit' Turner [Tue, 24 Nov 2009 01:04:14 +0000 (17:04 -0800)]
am cc09e088: Merge change Icb96cddc into eclair

Merge commit 'cc09e088d869453536a1e9d761bd92df1a19fe62' into eclair-mr2

* commit 'cc09e088d869453536a1e9d761bd92df1a19fe62':
  Cleanup installed binaries before the NDK build begins.

14 years agoam 0d6684c8: Merge change I44da0c8f into eclair
Eric Fischer [Tue, 24 Nov 2009 01:04:10 +0000 (17:04 -0800)]
am 0d6684c8: Merge change I44da0c8f into eclair

Merge commit '0d6684c86f152dabf7476d269fdaa3de1eb8fcac' into eclair-mr2

* commit '0d6684c86f152dabf7476d269fdaa3de1eb8fcac':
  Correct the raw offsets in the time zone index for a few zones.

14 years agoMerge change Icb96cddc into eclair
Android (Google) Code Review [Tue, 24 Nov 2009 00:59:36 +0000 (16:59 -0800)]
Merge change Icb96cddc into eclair

* changes:
  Cleanup installed binaries before the NDK build begins.

14 years agoMerge change I44da0c8f into eclair
Android (Google) Code Review [Tue, 24 Nov 2009 00:59:17 +0000 (16:59 -0800)]
Merge change I44da0c8f into eclair

* changes:
  Correct the raw offsets in the time zone index for a few zones.

14 years agoCorrect the raw offsets in the time zone index for a few zones.
Eric Fischer [Tue, 24 Nov 2009 00:30:34 +0000 (16:30 -0800)]
Correct the raw offsets in the time zone index for a few zones.

ZoneCompactor was using the system time zone database to get the offsets
instead of using the data it was compiling, so for newly added or recently
changed zones the index could be inconsistent with the data.

Affected zones: San_Luis, Casey, Davis, Mawson, Kathmandu, Novokuznetsk

14 years agoCleanup installed binaries before the NDK build begins.
David 'Digit' Turner [Tue, 24 Nov 2009 00:12:12 +0000 (16:12 -0800)]
Cleanup installed binaries before the NDK build begins.

Ensures that no stale/obsolete shared libraries are left in the
application's project path before the build.

Also fix a minor typo that made the ABI selection process not
work properly in certain cases.

14 years agoam ef50eddd: am 14f81209: am 0431e70d: Remove placeholder "-" label text, that was...
Roman Nurik [Tue, 24 Nov 2009 00:07:31 +0000 (16:07 -0800)]
am ef50eddd: am 14f81209: am 0431e70d: Remove placeholder "-" label text, that was breaking the build.

Merge commit 'ef50edddcc8224460aeac2b3ce41b8e332925c65'

* commit 'ef50edddcc8224460aeac2b3ce41b8e332925c65':
  Remove placeholder "-" label text, that was breaking the build.

14 years agoam 5797aa8a: am 536fc99b: am a7178809: Fresh new change for: Add Live Folder suppor...
Roman Nurik [Tue, 24 Nov 2009 00:04:54 +0000 (16:04 -0800)]
am 5797aa8a: am 536fc99b: am a7178809: Fresh new change for:   Add Live Folder support to NotePad sample, and add new icons for the app and Live Folder (separate for Donut and Eclair).

Merge commit '5797aa8abe19a99019623105f6229b63fb8b4cc6'

* commit '5797aa8abe19a99019623105f6229b63fb8b4cc6':
  Fresh new change for:

14 years agoam 2c522fa3: am ea6616ac: am f28c33b6: Merge change I4ba0290a into eclair
Roman Nurik [Tue, 24 Nov 2009 00:04:28 +0000 (16:04 -0800)]
am 2c522fa3: am ea6616ac: am f28c33b6: Merge change I4ba0290a into eclair

Merge commit '2c522fa3b79ce117769a06d9fd0a9b0a9e810be1'

* commit '2c522fa3b79ce117769a06d9fd0a9b0a9e810be1':
  Add Multiple Resolutions (MultiRes) sample code.

14 years agoam 14f81209: am 0431e70d: Remove placeholder "-" label text, that was breaking the...
Roman Nurik [Mon, 23 Nov 2009 23:43:25 +0000 (15:43 -0800)]
am 14f81209: am 0431e70d: Remove placeholder "-" label text, that was breaking the build.

Merge commit '14f81209b79faf87bf4ffed6fbaaa9da6a75d770' into eclair-mr2-plus-aosp

* commit '14f81209b79faf87bf4ffed6fbaaa9da6a75d770':
  Remove placeholder "-" label text, that was breaking the build.

14 years agoam 0431e70d: Remove placeholder "-" label text, that was breaking the build.
Roman Nurik [Mon, 23 Nov 2009 23:37:35 +0000 (15:37 -0800)]
am 0431e70d: Remove placeholder "-" label text, that was breaking the build.

Merge commit '0431e70ddd0673ed4d9cf69d211592cb2926c076' into eclair-mr2

* commit '0431e70ddd0673ed4d9cf69d211592cb2926c076':
  Remove placeholder "-" label text, that was breaking the build.

14 years agoRemove placeholder "-" label text, that was breaking the build.
Roman Nurik [Mon, 23 Nov 2009 22:54:57 +0000 (17:54 -0500)]
Remove placeholder "-" label text, that was breaking the build.

14 years agoam 536fc99b: am a7178809: Fresh new change for: Add Live Folder support to NotePad...
Roman Nurik [Mon, 23 Nov 2009 22:28:32 +0000 (14:28 -0800)]
am 536fc99b: am a7178809: Fresh new change for:   Add Live Folder support to NotePad sample, and add new icons for the app and Live Folder (separate for Donut and Eclair).

Merge commit '536fc99b535f6848752615a1b2bf0cddf8f23491' into eclair-mr2-plus-aosp

* commit '536fc99b535f6848752615a1b2bf0cddf8f23491':
  Fresh new change for:

14 years agoam a7178809: Fresh new change for: Add Live Folder support to NotePad sample, and...
Roman Nurik [Mon, 23 Nov 2009 22:24:37 +0000 (14:24 -0800)]
am a7178809: Fresh new change for:   Add Live Folder support to NotePad sample, and add new icons for the app and Live Folder (separate for Donut and Eclair).

Merge commit 'a7178809f6aecff7c4e3ae3374b7cba5adc692bf' into eclair-mr2

* commit 'a7178809f6aecff7c4e3ae3374b7cba5adc692bf':
  Fresh new change for:

14 years agoFresh new change for:
Roman Nurik [Mon, 23 Nov 2009 22:11:04 +0000 (17:11 -0500)]
Fresh new change for:
  Add Live Folder support to NotePad sample, and add new icons for the app and Live Folder (separate for Donut and Eclair).

Previous change 33290 was screwed up.

Xav, please pardon a repo newbie!

14 years agoam ea6616ac: am f28c33b6: Merge change I4ba0290a into eclair
Roman Nurik [Mon, 23 Nov 2009 21:53:42 +0000 (13:53 -0800)]
am ea6616ac: am f28c33b6: Merge change I4ba0290a into eclair

Merge commit 'ea6616ac3d733b1627d5addc9c62412d53dd1c26' into eclair-mr2-plus-aosp

* commit 'ea6616ac3d733b1627d5addc9c62412d53dd1c26':
  Add Multiple Resolutions (MultiRes) sample code.

14 years agoam f28c33b6: Merge change I4ba0290a into eclair
Roman Nurik [Mon, 23 Nov 2009 21:51:01 +0000 (13:51 -0800)]
am f28c33b6: Merge change I4ba0290a into eclair

Merge commit 'f28c33b6ec3401537a386995e2ec13fbc65c1957' into eclair-mr2

* commit 'f28c33b6ec3401537a386995e2ec13fbc65c1957':
  Add Multiple Resolutions (MultiRes) sample code.

14 years agoMerge change I4ba0290a into eclair
Android (Google) Code Review [Mon, 23 Nov 2009 21:45:14 +0000 (13:45 -0800)]
Merge change I4ba0290a into eclair

* changes:
  Add Multiple Resolutions (MultiRes) sample code.

14 years agoam 75239b51: am 21acc900: am e71c2828: am 1558abd6: Merge change I53e268db into eclai...
Scott Main [Mon, 23 Nov 2009 18:24:12 +0000 (10:24 -0800)]
am 75239b51: am 21acc900: am e71c2828: am 1558abd6: Merge change I53e268db into eclair-sdk

Merge commit '75239b51770825ea3da2673d4b81be1676145d51'

* commit '75239b51770825ea3da2673d4b81be1676145d51':
  docs: make the apidemos app index page only display the

14 years agoam 21acc900: am e71c2828: am 1558abd6: Merge change I53e268db into eclair-sdk
Scott Main [Mon, 23 Nov 2009 18:18:24 +0000 (10:18 -0800)]
am 21acc900: am e71c2828: am 1558abd6: Merge change I53e268db into eclair-sdk

Merge commit '21acc90055935d052e350fe441091091c2421010' into eclair-mr2-plus-aosp

* commit '21acc90055935d052e350fe441091091c2421010':
  docs: make the apidemos app index page only display the

14 years agoam e71c2828: am 1558abd6: Merge change I53e268db into eclair-sdk
Scott Main [Mon, 23 Nov 2009 18:13:44 +0000 (10:13 -0800)]
am e71c2828: am 1558abd6: Merge change I53e268db into eclair-sdk

Merge commit 'e71c282812a870c120ff8bf0989fd78c0191eeb2' into eclair-mr2

* commit 'e71c282812a870c120ff8bf0989fd78c0191eeb2':
  docs: make the apidemos app index page only display the

14 years agoam 1558abd6: Merge change I53e268db into eclair-sdk
Scott Main [Mon, 23 Nov 2009 18:07:10 +0000 (10:07 -0800)]
am 1558abd6: Merge change I53e268db into eclair-sdk

Merge commit '1558abd6d3706380cf4634c151ee7952e0b317fb' into eclair

* commit '1558abd6d3706380cf4634c151ee7952e0b317fb':
  docs: make the apidemos app index page only display the

14 years agoMerge change I53e268db into eclair-sdk
Android (Google) Code Review [Mon, 23 Nov 2009 17:57:22 +0000 (09:57 -0800)]
Merge change I53e268db into eclair-sdk

* changes:
  docs: make the apidemos app index page only display the shortcut links when the docs are online, because these links will not resolve when the docs are offline.

14 years agoAdd Multiple Resolutions (MultiRes) sample code.
Roman Nurik [Mon, 16 Nov 2009 20:23:42 +0000 (15:23 -0500)]
Add Multiple Resolutions (MultiRes) sample code.

14 years agoam 0a846112: am 2e00a813: am c7f23b57: Merge change Ifb9dee6f into eclair
David 'Digit' Turner [Sat, 21 Nov 2009 00:59:05 +0000 (16:59 -0800)]
am 0a846112: am 2e00a813: am c7f23b57: Merge change Ifb9dee6f into eclair

Merge commit '0a84611272549cf0fcee2bca5dde25ee20123ab8'

* commit '0a84611272549cf0fcee2bca5dde25ee20123ab8':
  Add support for armeabi-v7a to the NDK.

14 years agoam 2e00a813: am c7f23b57: Merge change Ifb9dee6f into eclair
David 'Digit' Turner [Sat, 21 Nov 2009 00:53:51 +0000 (16:53 -0800)]
am 2e00a813: am c7f23b57: Merge change Ifb9dee6f into eclair

Merge commit '2e00a8137d02b7478687f08431cd1f62abf17344' into eclair-mr2-plus-aosp

* commit '2e00a8137d02b7478687f08431cd1f62abf17344':
  Add support for armeabi-v7a to the NDK.

14 years agoam c7f23b57: Merge change Ifb9dee6f into eclair
David 'Digit' Turner [Sat, 21 Nov 2009 00:48:53 +0000 (16:48 -0800)]
am c7f23b57: Merge change Ifb9dee6f into eclair

Merge commit 'c7f23b570c16d99ce30b9819e28caee480795030' into eclair-mr2

* commit 'c7f23b570c16d99ce30b9819e28caee480795030':
  Add support for armeabi-v7a to the NDK.

14 years agoMerge change Ifb9dee6f into eclair
Android (Google) Code Review [Sat, 21 Nov 2009 00:44:45 +0000 (16:44 -0800)]
Merge change Ifb9dee6f into eclair

* changes:
  Add support for armeabi-v7a to the NDK.

14 years agoam 21c80426: am 7c91ccfe: am 2ddbd568: Update zoneinfo time zone data to version...
Eric Fischer [Fri, 20 Nov 2009 23:55:44 +0000 (15:55 -0800)]
am 21c80426: am 7c91ccfe: am 2ddbd568: Update zoneinfo time zone data to version 2009s

Merge commit '21c80426dd4fd1aa6fb13203e1422e562498f939'

* commit '21c80426dd4fd1aa6fb13203e1422e562498f939':
  Update zoneinfo time zone data to version 2009s

14 years agoam 7c91ccfe: am 2ddbd568: Update zoneinfo time zone data to version 2009s
Eric Fischer [Fri, 20 Nov 2009 23:47:08 +0000 (15:47 -0800)]
am 7c91ccfe: am 2ddbd568: Update zoneinfo time zone data to version 2009s

Merge commit '7c91ccfe1407cc192fb57c964c6419630cf651c0' into eclair-mr2-plus-aosp

* commit '7c91ccfe1407cc192fb57c964c6419630cf651c0':
  Update zoneinfo time zone data to version 2009s

14 years agoam 2ddbd568: Update zoneinfo time zone data to version 2009s
Eric Fischer [Fri, 20 Nov 2009 23:42:04 +0000 (15:42 -0800)]
am 2ddbd568: Update zoneinfo time zone data to version 2009s

Merge commit '2ddbd5682b60c8604b0b85ccb280624f8845e22d' into eclair-mr2

* commit '2ddbd5682b60c8604b0b85ccb280624f8845e22d':
  Update zoneinfo time zone data to version 2009s

14 years agodocs: make the apidemos app index page only display the
Scott Main [Fri, 20 Nov 2009 22:38:29 +0000 (14:38 -0800)]
docs: make the apidemos app index page only display the
shortcut links when the docs are online, because these
links will not resolve when the docs are offline.

this is a silly hack, but a temporary one until these
samples are moved.

Change-Id: I53e268db265cec143ca5e561ca2d6b4df3dba3e2

14 years agoUpdate zoneinfo time zone data to version 2009s
Eric Fischer [Fri, 20 Nov 2009 22:37:35 +0000 (14:37 -0800)]
Update zoneinfo time zone data to version 2009s

http://b/issue?id=2272477

14 years agoAdd support for armeabi-v7a to the NDK.
David 'Digit' Turner [Thu, 19 Nov 2009 02:05:55 +0000 (18:05 -0800)]
Add support for armeabi-v7a to the NDK.

This patch modifies the NDK build scripts to support the 'armeabi-v7a' ABI.
(For the record, it corresponds to Thumb-2 + FPU support, to speed up native
code on certain devices like the Droid).

To build for this ABI, the Application.mk file should use a line like:

  APP_ABI := armeabi-v7a

It is also possible to build for both 'armeabi' and 'armeabi-v7a' by using:

  APP_ABI := armeabi armeabi-v7a

This will result in the generation of two distinct shared libraries that both
will be copied to the final application package.

This is dependent on having GCC 4.4.0 prebuilt binaries under
build/prebuilt/<host>/arm-eabi-4.4.0, since gcc 4.2.1 does not support
this new ABI.

Note that this also changes the NDK to use gcc 4.4.0 by default, unless
the user defines NDK_TOOLCHAIN to 'arm-eabi-4.2.1' in its environment to
switch back to the previous one.

14 years agoam 688ccb34: am 1f22df41: am b4e31b93: Merge change I3f0d5eb5 into eclair
David 'Digit' Turner [Fri, 20 Nov 2009 01:42:01 +0000 (17:42 -0800)]
am 688ccb34: am 1f22df41: am b4e31b93: Merge change I3f0d5eb5 into eclair

Merge commit '688ccb34589b3a810dbdc7e79eab206a3d9227a6'

* commit '688ccb34589b3a810dbdc7e79eab206a3d9227a6':
  Update the build-toolchain.sh script.

14 years agoam 1f22df41: am b4e31b93: Merge change I3f0d5eb5 into eclair
David 'Digit' Turner [Thu, 19 Nov 2009 21:54:39 +0000 (13:54 -0800)]
am 1f22df41: am b4e31b93: Merge change I3f0d5eb5 into eclair

Merge commit '1f22df41d80b06331056fe3915a3d7c394b1485f' into eclair-mr2-plus-aosp

* commit '1f22df41d80b06331056fe3915a3d7c394b1485f':
  Update the build-toolchain.sh script.

14 years agoam b4e31b93: Merge change I3f0d5eb5 into eclair
David 'Digit' Turner [Thu, 19 Nov 2009 21:49:22 +0000 (13:49 -0800)]
am b4e31b93: Merge change I3f0d5eb5 into eclair

Merge commit 'b4e31b931d08e6269a194a1c24e23281410dff64' into eclair-mr2

* commit 'b4e31b931d08e6269a194a1c24e23281410dff64':
  Update the build-toolchain.sh script.

14 years agoMerge change I3f0d5eb5 into eclair
Android (Google) Code Review [Thu, 19 Nov 2009 21:45:53 +0000 (13:45 -0800)]
Merge change I3f0d5eb5 into eclair

* changes:
  Update the build-toolchain.sh script.

14 years agoUpdate the build-toolchain.sh script.
David 'Digit' Turner [Thu, 19 Nov 2009 01:03:52 +0000 (17:03 -0800)]
Update the build-toolchain.sh script.

This patch modifies the script to be able to build all prebuilt toolchain
binaries in a single call. I.e. if passed a recent toolchain source package
generated with download-toolchain-sources.sh, then it will build both
GCC 4.2.1 and GCC 4.4.0 and place them in the final prebuilt tarball.

We need this because, while we're going to switch to gcc 4.4.0 by default
in a new version of the NDK, the 4.4.0 C++ compiler is more strict about
various constructs and might refuse to build certain sources. An option
will be given to application developers to use 4.2.1 instead, to keep their
sources building.

Other changes include:

Move all builds into a random temporary directory under /tmp by default,
unless you use --build-out=<path>.

Cleanup the build out directory on succesful build

The generated tarball is now named android-ndk-prebuilt-<date>-<host>.tar.bz2
by default, unless you use the new --release=<name> option which will replace
<date> with <name> instead.

Removal of un-needed files (e.g. info or man pages, libiberty static library,
etc..) to reduce the size of the final tarball.

14 years agoam a9dcbaf1: am 4865c539: Add a runtest entry for the database tests.
Jeff Hamilton [Thu, 19 Nov 2009 19:09:47 +0000 (11:09 -0800)]
am a9dcbaf1: am 4865c539: Add a runtest entry for the database tests.

Merge commit 'a9dcbaf1fa228731acfe13f918946f13d2e387e5'

* commit 'a9dcbaf1fa228731acfe13f918946f13d2e387e5':
  Add a runtest entry for the database tests.

14 years agoam 4865c539: Add a runtest entry for the database tests.
Jeff Hamilton [Thu, 19 Nov 2009 19:04:42 +0000 (11:04 -0800)]
am 4865c539: Add a runtest entry for the database tests.

Merge commit '4865c5393faedabcb6884e745cb4b2393674c8fd' into eclair-mr2-plus-aosp

* commit '4865c5393faedabcb6884e745cb4b2393674c8fd':
  Add a runtest entry for the database tests.

14 years agoAdd a runtest entry for the database tests.
Jeff Hamilton [Thu, 19 Nov 2009 18:15:23 +0000 (10:15 -0800)]
Add a runtest entry for the database tests.

14 years agoam 934b8ca5: resolved conflicts for merge of 8915fd90 to eclair-mr2-plus-aosp
Xavier Ducrohet [Thu, 19 Nov 2009 01:58:54 +0000 (17:58 -0800)]
am 934b8ca5: resolved conflicts for merge of 8915fd90 to eclair-mr2-plus-aosp

Merge commit '934b8ca57bb5d45d28450c12af3a5c765ba51c12'

* commit '934b8ca57bb5d45d28450c12af3a5c765ba51c12':
  Remove components that were moved to sdk.git and update build scripts.

14 years agoresolved conflicts for merge of 8915fd90 to eclair-mr2-plus-aosp
Xavier Ducrohet [Thu, 19 Nov 2009 01:52:10 +0000 (17:52 -0800)]
resolved conflicts for merge of 8915fd90 to eclair-mr2-plus-aosp

14 years agoam 01d2087c: resolved conflicts for merge of 19cb54ea to eclair
Xavier Ducrohet [Thu, 19 Nov 2009 01:14:02 +0000 (17:14 -0800)]
am 01d2087c: resolved conflicts for merge of 19cb54ea to eclair

Merge commit '01d2087c87627df5bfc7e684f62466e0a662197a' into eclair-mr2

* commit '01d2087c87627df5bfc7e684f62466e0a662197a':
  Remove components that were moved to sdk.git and update build scripts.

14 years agoresolved conflicts for merge of 19cb54ea to eclair
Xavier Ducrohet [Thu, 19 Nov 2009 01:07:11 +0000 (17:07 -0800)]
resolved conflicts for merge of 19cb54ea to eclair

Change-Id: I182195aeaad88aebc82988b1cec9ebda0c359bc8

14 years agoam 1c563caa: am e970b3d1: Add "common" runtest definition (for android-common library...
Dan Egnor [Wed, 18 Nov 2009 21:21:54 +0000 (13:21 -0800)]
am 1c563caa: am e970b3d1: Add "common" runtest definition (for android-common library tests)

Merge commit '1c563caad4700be1be5eec2dab6d13b3dcd34e51'

* commit '1c563caad4700be1be5eec2dab6d13b3dcd34e51':
  Add "common" runtest definition (for android-common library tests)

14 years agoam e970b3d1: Add "common" runtest definition (for android-common library tests)
Dan Egnor [Wed, 18 Nov 2009 21:11:28 +0000 (13:11 -0800)]
am e970b3d1: Add "common" runtest definition (for android-common library tests)

Merge commit 'e970b3d160719a58ef9c91c637eb5ec9dc95a3fe' into eclair-mr2-plus-aosp

* commit 'e970b3d160719a58ef9c91c637eb5ec9dc95a3fe':
  Add "common" runtest definition (for android-common library tests)

14 years agoAdd "common" runtest definition (for android-common library tests)
Dan Egnor [Wed, 18 Nov 2009 20:05:35 +0000 (12:05 -0800)]
Add "common" runtest definition (for android-common library tests)

14 years agoRemove components that were moved to sdk.git and update build scripts.
Xavier Ducrohet [Tue, 17 Nov 2009 23:11:59 +0000 (15:11 -0800)]
Remove components that were moved to sdk.git and update build scripts.

14 years agoam a7e42085: am 6ae0010c: am 20d03274: Merge change I6809bd44 into eclair
Raphael [Tue, 17 Nov 2009 15:34:58 +0000 (07:34 -0800)]
am a7e42085: am 6ae0010c: am 20d03274: Merge change I6809bd44 into eclair

Merge commit 'a7e42085979affcc374fc15d7e86a1bf0a0f0176'

* commit 'a7e42085979affcc374fc15d7e86a1bf0a0f0176':
  SDK Manager: XML Schema for sdk-repository v2

14 years agoam ca443267: am 5ad866dd: am e4df0ea1: Merge change I8d8b5816 into eclair
David 'Digit' Turner [Tue, 17 Nov 2009 15:32:35 +0000 (07:32 -0800)]
am ca443267: am 5ad866dd: am e4df0ea1: Merge change I8d8b5816 into eclair

Merge commit 'ca4432676724e715caa50958383447ad2b65f02e'

* commit 'ca4432676724e715caa50958383447ad2b65f02e':
  Update build-toolchain.sh to be able to build gcc 4.4.0

14 years agoam 853340a6: am 245c4282: am f3ec7a02: Merge change If72f81fb into eclair
David 'Digit' Turner [Tue, 17 Nov 2009 15:32:31 +0000 (07:32 -0800)]
am 853340a6: am 245c4282: am f3ec7a02: Merge change If72f81fb into eclair

Merge commit '853340a697d6fbdb1dc06ea8ad8073f228c0aa1b'

* commit '853340a697d6fbdb1dc06ea8ad8073f228c0aa1b':
  Add a script to download and package the toolchain sources.

14 years agoam 7371e184: am 12ed1a7d: am 5df7d75e: am f4c63fae: SDK Manager support for future...
Raphael [Tue, 17 Nov 2009 15:32:15 +0000 (07:32 -0800)]
am 7371e184: am 12ed1a7d: am 5df7d75e: am f4c63fae: SDK Manager support for future schemas.

Merge commit '7371e1847510e54995d4b1b1817370c3867bea52'

* commit '7371e1847510e54995d4b1b1817370c3867bea52':
  SDK Manager support for future schemas.

14 years agoam 6ae0010c: am 20d03274: Merge change I6809bd44 into eclair
Raphael [Tue, 17 Nov 2009 04:00:32 +0000 (20:00 -0800)]
am 6ae0010c: am 20d03274: Merge change I6809bd44 into eclair

Merge commit '6ae0010c61ed927ad715de4a75e140c932e1d86a' into eclair-mr2-plus-aosp

* commit '6ae0010c61ed927ad715de4a75e140c932e1d86a':
  SDK Manager: XML Schema for sdk-repository v2

14 years agoam 20d03274: Merge change I6809bd44 into eclair
Raphael [Tue, 17 Nov 2009 03:56:59 +0000 (19:56 -0800)]
am 20d03274: Merge change I6809bd44 into eclair

Merge commit '20d0327492490b676a0a1036754e7742fb92bb69' into eclair-mr2

* commit '20d0327492490b676a0a1036754e7742fb92bb69':
  SDK Manager: XML Schema for sdk-repository v2

14 years agoMerge change I6809bd44 into eclair
Android (Google) Code Review [Tue, 17 Nov 2009 03:39:13 +0000 (19:39 -0800)]
Merge change I6809bd44 into eclair

* changes:
  SDK Manager: XML Schema for sdk-repository v2

14 years agoSDK Manager: XML Schema for sdk-repository v2
Raphael [Tue, 17 Nov 2009 02:00:59 +0000 (18:00 -0800)]
SDK Manager: XML Schema for sdk-repository v2

v2 will be a full standalone schema, not reusing any parts of v1.
Each package type is now defined using a named type, which means
a v3 version would redifine the top element and could include
some named types of v2.

Unfortunately we cannot *extend* the top element from v1 because
extension in XML Schema seems to imply a sequence (i.e. fixed order)
whereas we use a "choice" mode to have 0..N of each types in any
order.

SDK BUG 2252825

Change-Id: I6809bd4486ef2d7f2473995ed5a0abb7fa377bdd

14 years agoam 5ad866dd: am e4df0ea1: Merge change I8d8b5816 into eclair
David 'Digit' Turner [Mon, 16 Nov 2009 23:03:39 +0000 (15:03 -0800)]
am 5ad866dd: am e4df0ea1: Merge change I8d8b5816 into eclair

Merge commit '5ad866dd5dd886556be67b13e3138f979816f35a' into eclair-mr2-plus-aosp

* commit '5ad866dd5dd886556be67b13e3138f979816f35a':
  Update build-toolchain.sh to be able to build gcc 4.4.0

14 years agoam 245c4282: am f3ec7a02: Merge change If72f81fb into eclair
David 'Digit' Turner [Mon, 16 Nov 2009 23:03:34 +0000 (15:03 -0800)]
am 245c4282: am f3ec7a02: Merge change If72f81fb into eclair

Merge commit '245c4282dbccddc611dba1ff8a2575a33f9217b5' into eclair-mr2-plus-aosp

* commit '245c4282dbccddc611dba1ff8a2575a33f9217b5':
  Add a script to download and package the toolchain sources.