Commit Graph

3376 Commits

Author SHA1 Message Date
Android (Google) Code Review
2171d57cfc Merge change I6f2fcdd7 into eclair-mr2
* changes:
  Fix eclipse default .classpath
2009-11-24 16:08:54 -08:00
Andrew Stadler
6f2fcdd7d4 Fix eclipse default .classpath
* Add frameworks/base/common/java
* Remove external/googleclient/googleclient-lib.jar
2009-11-24 13:50:26 -08:00
David 'Digit' Turner
e728c1660b am 014d368c: am 4b4129d3: am cc09e088: Merge change Icb96cddc into eclair
Merge commit '014d368c389cfeb29aeb59448696cf08a6d8c47a'

* commit '014d368c389cfeb29aeb59448696cf08a6d8c47a':
  Cleanup installed binaries before the NDK build begins.
2009-11-23 17:12:25 -08:00
Eric Fischer
f7246208e9 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.
2009-11-23 17:12:21 -08:00
David 'Digit' Turner
014d368c38 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.
2009-11-23 17:08:16 -08:00
Eric Fischer
f7c5f462dd 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.
2009-11-23 17:08:12 -08:00
David 'Digit' Turner
4b4129d30c am cc09e088: Merge change Icb96cddc into eclair
Merge commit 'cc09e088d869453536a1e9d761bd92df1a19fe62' into eclair-mr2

* commit 'cc09e088d869453536a1e9d761bd92df1a19fe62':
  Cleanup installed binaries before the NDK build begins.
2009-11-23 17:04:14 -08:00
Eric Fischer
78cab8038a 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.
2009-11-23 17:04:10 -08:00
Android (Google) Code Review
cc09e088d8 Merge change Icb96cddc into eclair
* changes:
  Cleanup installed binaries before the NDK build begins.
2009-11-23 16:59:36 -08:00
Android (Google) Code Review
0d6684c86f Merge change I44da0c8f into eclair
* changes:
  Correct the raw offsets in the time zone index for a few zones.
2009-11-23 16:59:17 -08:00
Eric Fischer
1f9f586c83 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
2009-11-23 16:45:09 -08:00
David 'Digit' Turner
cb96cddc77 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.
2009-11-23 16:12:12 -08:00
Roman Nurik
23d4440563 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.
2009-11-23 16:07:31 -08:00
Roman Nurik
b50cd5b656 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:
2009-11-23 16:04:54 -08:00
Roman Nurik
4b8db8ce70 am 2c522fa3: am ea6616ac: am f28c33b6: Merge change I4ba0290a into eclair
Merge commit '2c522fa3b79ce117769a06d9fd0a9b0a9e810be1'

* commit '2c522fa3b79ce117769a06d9fd0a9b0a9e810be1':
  Add Multiple Resolutions (MultiRes) sample code.
2009-11-23 16:04:28 -08:00
Roman Nurik
ef50edddcc 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.
2009-11-23 15:43:25 -08:00
Roman Nurik
14f81209b7 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.
2009-11-23 15:37:35 -08:00
Roman Nurik
0431e70ddd Remove placeholder "-" label text, that was breaking the build. 2009-11-23 17:54:57 -05:00
Roman Nurik
5797aa8abe 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:
2009-11-23 14:28:32 -08:00
Roman Nurik
536fc99b53 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:
2009-11-23 14:24:37 -08:00
Roman Nurik
a7178809f6 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!
2009-11-23 17:12:19 -05:00
Roman Nurik
2c522fa3b7 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.
2009-11-23 13:53:42 -08:00
Roman Nurik
ea6616ac3d am f28c33b6: Merge change I4ba0290a into eclair
Merge commit 'f28c33b6ec3401537a386995e2ec13fbc65c1957' into eclair-mr2

* commit 'f28c33b6ec3401537a386995e2ec13fbc65c1957':
  Add Multiple Resolutions (MultiRes) sample code.
2009-11-23 13:51:01 -08:00
Android (Google) Code Review
f28c33b6ec Merge change I4ba0290a into eclair
* changes:
  Add Multiple Resolutions (MultiRes) sample code.
2009-11-23 13:45:14 -08:00
Scott Main
d75bfa57d6 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
2009-11-23 10:24:12 -08:00
Scott Main
75239b5177 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
2009-11-23 10:18:24 -08:00
Scott Main
21acc90055 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
2009-11-23 10:13:44 -08:00
Scott Main
e71c282812 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
2009-11-23 10:07:10 -08:00
Android (Google) Code Review
1558abd6d3 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.
2009-11-23 09:57:22 -08:00
Roman Nurik
d7f64d5338 Add Multiple Resolutions (MultiRes) sample code. 2009-11-23 11:44:11 -05:00
David 'Digit' Turner
5d275b631b am 0a846112: am 2e00a813: am c7f23b57: Merge change Ifb9dee6f into eclair
Merge commit '0a84611272549cf0fcee2bca5dde25ee20123ab8'

* commit '0a84611272549cf0fcee2bca5dde25ee20123ab8':
  Add support for armeabi-v7a to the NDK.
2009-11-20 16:59:05 -08:00
David 'Digit' Turner
0a84611272 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.
2009-11-20 16:53:51 -08:00
David 'Digit' Turner
2e00a8137d am c7f23b57: Merge change Ifb9dee6f into eclair
Merge commit 'c7f23b570c16d99ce30b9819e28caee480795030' into eclair-mr2

* commit 'c7f23b570c16d99ce30b9819e28caee480795030':
  Add support for armeabi-v7a to the NDK.
2009-11-20 16:48:53 -08:00
Android (Google) Code Review
c7f23b570c Merge change Ifb9dee6f into eclair
* changes:
  Add support for armeabi-v7a to the NDK.
2009-11-20 16:44:45 -08:00
Eric Fischer
ea11d56a72 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
2009-11-20 15:55:44 -08:00
Eric Fischer
21c80426dd 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
2009-11-20 15:47:08 -08:00
Eric Fischer
7c91ccfe14 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
2009-11-20 15:42:04 -08:00
Scott Main
ea6c4f9082 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
2009-11-20 14:55:07 -08:00
Eric Fischer
2ddbd5682b Update zoneinfo time zone data to version 2009s
http://b/issue?id=2272477
2009-11-20 14:37:35 -08:00
David 'Digit' Turner
f5862d8da6 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.
2009-11-20 14:07:15 -08:00
David 'Digit' Turner
47bb424002 am 688ccb34: am 1f22df41: am b4e31b93: Merge change I3f0d5eb5 into eclair
Merge commit '688ccb34589b3a810dbdc7e79eab206a3d9227a6'

* commit '688ccb34589b3a810dbdc7e79eab206a3d9227a6':
  Update the build-toolchain.sh script.
2009-11-19 17:42:01 -08:00
David 'Digit' Turner
688ccb3458 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.
2009-11-19 13:54:39 -08:00
David 'Digit' Turner
1f22df41d8 am b4e31b93: Merge change I3f0d5eb5 into eclair
Merge commit 'b4e31b931d08e6269a194a1c24e23281410dff64' into eclair-mr2

* commit 'b4e31b931d08e6269a194a1c24e23281410dff64':
  Update the build-toolchain.sh script.
2009-11-19 13:49:22 -08:00
Android (Google) Code Review
b4e31b931d Merge change I3f0d5eb5 into eclair
* changes:
  Update the build-toolchain.sh script.
2009-11-19 13:45:53 -08:00
David 'Digit' Turner
69eeb8a22f 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.
2009-11-19 13:43:11 -08:00
Jeff Hamilton
d95ef21ffe 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.
2009-11-19 11:09:47 -08:00
Jeff Hamilton
a9dcbaf1fa 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.
2009-11-19 11:04:42 -08:00
Jeff Hamilton
4865c5393f Add a runtest entry for the database tests. 2009-11-19 10:15:23 -08:00
Xavier Ducrohet
09021d3593 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.
2009-11-18 17:58:54 -08:00
Xavier Ducrohet
934b8ca57b resolved conflicts for merge of 8915fd90 to eclair-mr2-plus-aosp 2009-11-18 17:52:10 -08:00