OSDN Git Service
The Android Open Source Project [Wed, 31 Oct 2012 16:15:16 +0000 (09:15 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ice07f7813d823b0419153d5ac321ad784a690af4
The Android Automerger [Wed, 31 Oct 2012 03:11:57 +0000 (20:11 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Elliott Hughes [Wed, 31 Oct 2012 00:18:04 +0000 (17:18 -0700)]
am
084be591: Merge "linker: handle R_ARM_COPY relocations in a proper way"
* commit '
084be591923d3d509cea0a0f4b11b073e362d730':
linker: handle R_ARM_COPY relocations in a proper way
Elliott Hughes [Wed, 31 Oct 2012 00:10:30 +0000 (17:10 -0700)]
Merge "linker: handle R_ARM_COPY relocations in a proper way"
Ard Biesheuvel [Thu, 30 Aug 2012 10:48:32 +0000 (12:48 +0200)]
linker: handle R_ARM_COPY relocations in a proper way
If an executable contain copy relocations, other references
to the symbol it points to should be preempted and made to
point to the copy instead.
Also, the linker should make sure the target area has
sufficient space to contain the copy. It also checks
whether the library that supplies the symbol is built
with -Bsymbolic, and errors out if this is the case.
Change-Id: If135c83590092741cfd8f82f54816f363a4a4a3b
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@gmail.com>
Elliott Hughes [Tue, 30 Oct 2012 23:56:29 +0000 (16:56 -0700)]
am
155e8d1d: Merge "More dynamic linker cleanup."
* commit '
155e8d1df5b8fdfeabda3e7b61d95beb5b8d1467':
More dynamic linker cleanup.
Elliott Hughes [Tue, 30 Oct 2012 23:41:00 +0000 (16:41 -0700)]
Merge "More dynamic linker cleanup."
Elliott Hughes [Tue, 30 Oct 2012 00:37:13 +0000 (17:37 -0700)]
More dynamic linker cleanup.
I still want to break linker_format out into its own library so we can reuse
it for malloc debugging and so forth. (There are many similar pieces of code
in bionic, but the linker's one seems to be the most complete/functional.)
Change-Id: If3721853d28937c8e821ca1d23cf200e228a409a
Elliott Hughes [Tue, 30 Oct 2012 22:20:13 +0000 (15:20 -0700)]
Merge commit '
bd8ee3d3' into mm
Elliott Hughes [Tue, 30 Oct 2012 21:30:12 +0000 (14:30 -0700)]
am
a811d7a8: Upgrade to tzdata2012h.
* commit '
a811d7a8e638ca49aee704c613cb9f1e03c3698d':
Upgrade to tzdata2012h.
Elliott Hughes [Tue, 30 Oct 2012 20:04:23 +0000 (13:04 -0700)]
am
06b59610: Merge "Fix bug in pthread_join, pthread_exit, pthread_detach"
* commit '
06b596104a9ed3ac089abd00186a5698d7e8544f':
Fix bug in pthread_join, pthread_exit, pthread_detach
Elliott Hughes [Tue, 30 Oct 2012 19:57:57 +0000 (12:57 -0700)]
Merge "Fix bug in pthread_join, pthread_exit, pthread_detach"
Elliott Hughes [Tue, 30 Oct 2012 00:15:12 +0000 (17:15 -0700)]
am
1f21ece4: Merge "Clean up the <libgen.h> implementation a little, bring in tests."
* commit '
1f21ece48a87abbbdd9fb939b79a1dd81fb867eb':
Clean up the <libgen.h> implementation a little, bring in tests.
Elliott Hughes [Tue, 30 Oct 2012 00:15:09 +0000 (17:15 -0700)]
am
4d36b0bd: Merge "Fix the pthread_join on self error case."
* commit '
4d36b0bd38559ae0376b61a0ac2f5fa8329ec56d':
Fix the pthread_join on self error case.
Elliott Hughes [Tue, 30 Oct 2012 00:15:03 +0000 (17:15 -0700)]
am
9297af94: Merge "Fix a potential NULL pointer dereference in _init_thread()."
* commit '
9297af943887d9d6974aaec8c45a4e7d93422965':
Fix a potential NULL pointer dereference in _init_thread().
Elliott Hughes [Tue, 30 Oct 2012 00:15:02 +0000 (17:15 -0700)]
am
33c4a3ad: Merge "libc: Fix alphasort() signature (and implementation)."
* commit '
33c4a3adde3cf1753af0661f48ce86358e105277':
libc: Fix alphasort() signature (and implementation).
Elliott Hughes [Tue, 30 Oct 2012 00:15:01 +0000 (17:15 -0700)]
am
8f9a1eb1: Merge "Upgrade to tzdata2012h."
* commit '
8f9a1eb108f22fc2ce7283ef184d909ec0ca1152':
Upgrade to tzdata2012h.
Elliott Hughes [Tue, 30 Oct 2012 00:14:59 +0000 (17:14 -0700)]
am
9e783963: Merge "Clean up the implementation of the <dirent.h> functions."
* commit '
9e783963d58acf48e06902236ea64c7f5b337a0f':
Clean up the implementation of the <dirent.h> functions.
Elliott Hughes [Mon, 29 Oct 2012 22:03:21 +0000 (15:03 -0700)]
Merge "Clean up the <libgen.h> implementation a little, bring in tests."
Elliott Hughes [Mon, 29 Oct 2012 21:27:10 +0000 (14:27 -0700)]
Clean up the <libgen.h> implementation a little, bring in tests.
Most of these tests were in system/extras, but I've added more to cover other
cases explicitly mentioned by POSIX.
Change-Id: I5e8d77e4179028d77306935cceadbb505515dcde
Sergey Melnikov [Fri, 26 Oct 2012 10:06:43 +0000 (14:06 +0400)]
Fix bug in pthread_join, pthread_exit, pthread_detach
pthread_no_op_detach_after_join test from bionic-unit-tests hangs
on x86 emulator. There is a race in the pthread_join, pthread_exit,
pthread_detach functions:
- pthread_join waits for the non-detached thread
- pthread_detach sets the detached flag on that thread
- the thread executes pthread_exit which just kills the now-detached
thread, without sending the join notification.
This patch improves the test so it fails on ARM too, and modifies
pthread_detach to behave more like glibc, not setting the detach state if
called on a thread that's already being joined (but not returning an error).
Change-Id: I87dc688221ce979ef5178753dd63d01ac0b108e6
Signed-off-by: Sergey Melnikov <sergey.melnikov@intel.com>
Elliott Hughes [Mon, 29 Oct 2012 17:30:15 +0000 (10:30 -0700)]
Merge "Fix the pthread_join on self error case."
Elliott Hughes [Mon, 29 Oct 2012 17:19:44 +0000 (10:19 -0700)]
Fix the pthread_join on self error case.
We should return EDEADLK, not deadlock the calling thread.
Change-Id: I1243483f709c11b2a60e41142725c54c7dbfcbc9
Elliott Hughes [Mon, 29 Oct 2012 15:26:01 +0000 (08:26 -0700)]
Merge "Fix a potential NULL pointer dereference in _init_thread()."
Xi Wang [Sat, 27 Oct 2012 06:02:01 +0000 (02:02 -0400)]
Fix a potential NULL pointer dereference in _init_thread().
The first NULL pointer check against `attr' suggests that `attr' can
be NULL. Then later `attr' is directly dereferenced, suggesting the
opposite.
if (attr == NULL) {
...
} else {
...
}
...
if (attr->stack_base == ...) { ... }
The public API pthread_create(3) allows NULL, and interprets it as "default".
Our implementation actually swaps in a pointer to the global default
pthread_attr_t, so we don't need any NULL checks in _init_thread. (The other
internal caller passes its own pthread_attr_t.)
Change-Id: I0a4e79b83f5989249556a07eed1f2887e96c915e
Signed-off-by: Xi Wang <xi.wang@gmail.com>
Elliott Hughes [Mon, 29 Oct 2012 14:45:12 +0000 (07:45 -0700)]
Merge "libc: Fix alphasort() signature (and implementation)."
David 'Digit' Turner [Mon, 29 Oct 2012 14:32:54 +0000 (15:32 +0100)]
libc: Fix alphasort() signature (and implementation).
The declaration for alphasort() in <dirent.h> used the deprecated:
int alphasort(const void*, const void*);
while both Posix and GLibc use instead:
int alphasort(const struct dirent** a, const struct dirent** b);
See: http://pubs.opengroup.org/onlinepubs/
9699919799/functions/alphasort.html
This patch does the following:
- Update the declaration to match Posix/GLibc
- Get rid of the upstream BSD code which isn't compatible with the new
signature.
- Implement a new trivial alphasort() with the right signature, and
ensure that it uses strcoll() instead of strcmp().
- Remove Bionic-specific #ifdef .. #else .. #endif block in
dirent_test.cpp which uses alphasort().
Even through strcoll() currently uses strcmp(), this does the right
thing in the case where we decide to update strcoll() to properly
implement locale-specific ordered comparison.
Change-Id: I4fd45604d8a940aaf2eb0ecd7d73e2f11c9bca96
Elliott Hughes [Mon, 29 Oct 2012 14:29:13 +0000 (07:29 -0700)]
Merge "Upgrade to tzdata2012h."
Elliott Hughes [Sat, 27 Oct 2012 21:32:44 +0000 (14:32 -0700)]
Upgrade to tzdata2012h.
The 2012h release reflects the following changes recently circulated
on the tz mailing list:
[Brazil] Bahia no longer has DST. (Thanks to Kelley Cook.)
[Brazil] Tocantins has DST. (Thanks to Rodrigo Severo.)
[Israel] Israel has new DST rules next year. (Thanks to Ephraim Silverberg.)
[Jordan] Jordan stays on DST this winter. (Thanks to Steffen Thorsen.)
Bug:
7429010
Change-Id: I0ec5fb72343e42f3f79490dfdea5f7f1946ae76f
Elliott Hughes [Sat, 27 Oct 2012 21:29:14 +0000 (14:29 -0700)]
Upgrade to tzdata2012h.
The 2012h release reflects the following changes recently circulated
on the tz mailing list:
[Brazil] Bahia no longer has DST. (Thanks to Kelley Cook.)
[Brazil] Tocantins has DST. (Thanks to Rodrigo Severo.)
[Israel] Israel has new DST rules next year. (Thanks to Ephraim Silverberg.)
[Jordan] Jordan stays on DST this winter. (Thanks to Steffen Thorsen.)
Bug:
7429010
Change-Id: I82f19ce49f944f928b6dd8dc5a893786266e5cb9
Elliott Hughes [Fri, 26 Oct 2012 23:42:47 +0000 (16:42 -0700)]
Merge "Clean up the implementation of the <dirent.h> functions."
Elliott Hughes [Fri, 26 Oct 2012 03:55:23 +0000 (20:55 -0700)]
Clean up the implementation of the <dirent.h> functions.
Change-Id: I3c647cc9588525afc41fee90ee468d58cd13503a
Elliott Hughes [Thu, 25 Oct 2012 22:20:29 +0000 (15:20 -0700)]
am
7193731a: Merge "Workaround g++ 4.7 compfail"
* commit '
7193731ae6b8083bc7a5e5e468fb98b1dbcf3f3d':
Workaround g++ 4.7 compfail
Elliott Hughes [Thu, 25 Oct 2012 22:09:29 +0000 (15:09 -0700)]
am
f2b3ac95: Merge "Fix recovery: don\'t assert if there\'s no tzdata."
* commit '
f2b3ac9502e08ef53d4eedd7e93ea9a00d185055':
Fix recovery: don't assert if there's no tzdata.
Elliott Hughes [Thu, 25 Oct 2012 22:00:45 +0000 (15:00 -0700)]
Merge "Workaround g++ 4.7 compfail"
Elliott Hughes [Thu, 25 Oct 2012 21:56:53 +0000 (14:56 -0700)]
Merge "Fix recovery: don't assert if there's no tzdata."
Elliott Hughes [Thu, 25 Oct 2012 21:38:51 +0000 (14:38 -0700)]
Fix recovery: don't assert if there's no tzdata.
Change-Id: I4d808b57c63ec1ccc024da7fd6a65691e0d455c5
Elliott Hughes [Thu, 25 Oct 2012 19:22:34 +0000 (12:22 -0700)]
am
7b68e3f7: Merge "Per-thread -fstack-protector guards for x86."
* commit '
7b68e3f799d87e84c56687033326924fd8fec84c':
Per-thread -fstack-protector guards for x86.
Elliott Hughes [Thu, 25 Oct 2012 19:08:50 +0000 (12:08 -0700)]
Merge "Per-thread -fstack-protector guards for x86."
Elliott Hughes [Thu, 25 Oct 2012 01:37:21 +0000 (18:37 -0700)]
Per-thread -fstack-protector guards for x86.
Based on a pair of patches from Intel:
https://android-review.googlesource.com/#/c/43909/
https://android-review.googlesource.com/#/c/44903/
For x86, this patch supports _both_ the global that ARM/MIPS use
and the per-thread TLS entry (%gs:20) that GCC uses by default. This
lets us support binaries built with any x86 toolchain (right now,
the NDK is emitting x86 code that uses the global).
I've also extended the original tests to cover ARM/MIPS too, and
be a little more thorough for x86.
Change-Id: I02f279a80c6b626aecad449771dec91df235ad01
Pavel Chupin [Thu, 25 Oct 2012 08:17:05 +0000 (12:17 +0400)]
Workaround g++ 4.7 compfail
error: C99 designator 'name' outside aggregate initializer
G++ 4.7+ can't handle some of C99 designated initializers.
Most likely it's just not implemented yet. Other possible workarounds is
to compile this as C not C++ or define name as char* instead of char[SIZE].
Appeared after this change https://android-review.googlesource.com/#/c/44470
Change-Id: Ib28157848ce759b8bb5dbb2ac0d9a768fa4e5107
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
Elliott Hughes [Wed, 24 Oct 2012 00:15:07 +0000 (17:15 -0700)]
am
d0f2b7e7: Merge "More upstream NetBSD upgrades."
* commit '
d0f2b7e7e65f19f978c59abcbb522c08e76b1508':
More upstream NetBSD upgrades.
Elliott Hughes [Tue, 23 Oct 2012 23:55:19 +0000 (16:55 -0700)]
Merge "More upstream NetBSD upgrades."
Elliott Hughes [Tue, 23 Oct 2012 23:05:09 +0000 (16:05 -0700)]
More upstream NetBSD upgrades.
Change-Id: Idb781d37de3b05585271d7d258ecffd5ba87d0b8
Elliott Hughes [Tue, 23 Oct 2012 20:55:59 +0000 (13:55 -0700)]
am
e3dbe1e3: Merge "Upgrade more functions to the current upstream NetBSD copy."
* commit '
e3dbe1e3820d6ab0370566055e9cdc593c5cce48':
Upgrade more functions to the current upstream NetBSD copy.
Elliott Hughes [Tue, 23 Oct 2012 20:45:36 +0000 (13:45 -0700)]
Merge "Upgrade more functions to the current upstream NetBSD copy."
Elliott Hughes [Tue, 23 Oct 2012 19:26:26 +0000 (12:26 -0700)]
Upgrade more functions to the current upstream NetBSD copy.
Change-Id: Ie0b3f8b3fccef28609eb210434413ebd51d6ef45
Elliott Hughes [Tue, 23 Oct 2012 01:06:55 +0000 (18:06 -0700)]
am
fb93e6a5: Merge "Move setlocale(3) and the wchar stubs over to .cpp."
* commit '
fb93e6a5b322a87e61de19421a72d6dfcc82b614':
Move setlocale(3) and the wchar stubs over to .cpp.
Elliott Hughes [Tue, 23 Oct 2012 00:50:26 +0000 (17:50 -0700)]
Merge "Move setlocale(3) and the wchar stubs over to .cpp."
Elliott Hughes [Tue, 23 Oct 2012 00:05:27 +0000 (17:05 -0700)]
Move setlocale(3) and the wchar stubs over to .cpp.
Also separate out the C++ files so we can use -Werror on them. I'd
rather wait for LOCAL_CPPFLAGS to be in AOSP, but this also lets us
see which files still need to be sorted into one bucket or the other.
Change-Id: I6acc1f7c043935c70a3b089f705d218b9aaaba0a
Elliott Hughes [Mon, 22 Oct 2012 23:29:13 +0000 (16:29 -0700)]
am
5a9911e9: Merge "Add missing BEGIN_DECLS/END_DECLS for FORTIFY_SOURCE stdio prototypes."
* commit '
5a9911e94086a15a7f2d5a7c9173847f123a46ea':
Add missing BEGIN_DECLS/END_DECLS for FORTIFY_SOURCE stdio prototypes.
Elliott Hughes [Mon, 22 Oct 2012 23:29:12 +0000 (16:29 -0700)]
am
574773b1: Merge "Clean up warnings in stubs.cpp."
* commit '
574773b1eae797e2f7a1d11d0176755d2e74eb41':
Clean up warnings in stubs.cpp.
Elliott Hughes [Mon, 22 Oct 2012 23:13:03 +0000 (16:13 -0700)]
Merge "Add missing BEGIN_DECLS/END_DECLS for FORTIFY_SOURCE stdio prototypes."
Elliott Hughes [Mon, 22 Oct 2012 23:12:46 +0000 (16:12 -0700)]
Merge "Clean up warnings in stubs.cpp."
Elliott Hughes [Mon, 22 Oct 2012 23:10:27 +0000 (16:10 -0700)]
Add missing BEGIN_DECLS/END_DECLS for FORTIFY_SOURCE stdio prototypes.
Change-Id: I35ceb09fedf873c5e98e1e26efce5e4f00a17e74
Elliott Hughes [Mon, 22 Oct 2012 23:04:56 +0000 (16:04 -0700)]
Clean up warnings in stubs.cpp.
Change-Id: Ie0792846de7cf5f5c72737494bf78ab8dcb8cc3e
Elliott Hughes [Mon, 22 Oct 2012 22:57:42 +0000 (15:57 -0700)]
am
4e457759: Merge "Move the FORTIFY_SOURCE helpers over to .cpp."
* commit '
4e457759893a6a6ab4f84a5aea231d0a11c7bb13':
Move the FORTIFY_SOURCE helpers over to .cpp.
Elliott Hughes [Mon, 22 Oct 2012 22:51:11 +0000 (15:51 -0700)]
Merge "Move the FORTIFY_SOURCE helpers over to .cpp."
Elliott Hughes [Mon, 22 Oct 2012 22:32:01 +0000 (15:32 -0700)]
Move the FORTIFY_SOURCE helpers over to .cpp.
Change-Id: Ib5067d51b983cac7760c975becce7fe2408ead04
Elliott Hughes [Mon, 22 Oct 2012 22:08:38 +0000 (15:08 -0700)]
am
df92635a: Merge "Support zone.tab in bionic, and remove the file format version."
* commit '
df92635a57e8093d9cbffc38bbf513f3361ee91e':
Support zone.tab in bionic, and remove the file format version.
Elliott Hughes [Mon, 22 Oct 2012 21:56:31 +0000 (14:56 -0700)]
Merge "Support zone.tab in bionic, and remove the file format version."
Elliott Hughes [Mon, 22 Oct 2012 21:47:58 +0000 (14:47 -0700)]
Support zone.tab in bionic, and remove the file format version.
Bug:
7012465
Change-Id: I6335c91ebadc609fae85bad94db972be7574b6e4
Elliott Hughes [Mon, 22 Oct 2012 18:53:22 +0000 (11:53 -0700)]
am
eb370aa3: Merge "Make bionic look in /data/misc for tzdata updates."
* commit '
eb370aa31dd549ad7a7a2044dedab1140a7aeda9':
Make bionic look in /data/misc for tzdata updates.
Elliott Hughes [Mon, 22 Oct 2012 18:37:26 +0000 (11:37 -0700)]
Merge "Make bionic look in /data/misc for tzdata updates."
Elliott Hughes [Sat, 20 Oct 2012 01:13:15 +0000 (18:13 -0700)]
Make bionic look in /data/misc for tzdata updates.
Bug:
7012465
Change-Id: I4d1018f686f2409600fdb6630732cae33efe8f02
Elliott Hughes [Sat, 20 Oct 2012 00:21:41 +0000 (17:21 -0700)]
am
dc595d83: Merge "Change ZoneCompator to generate the single "tzdata" file."
* commit '
dc595d830898e5859bf98d7436af2a777a11f810':
Change ZoneCompator to generate the single "tzdata" file.
Elliott Hughes [Sat, 20 Oct 2012 00:21:40 +0000 (17:21 -0700)]
am
7a85c42b: Merge "Update generate-NOTICE.py to know about tzdata."
* commit '
7a85c42b8f7af801a31208ed83589b5397baee73':
Update generate-NOTICE.py to know about tzdata.
Elliott Hughes [Sat, 20 Oct 2012 00:12:37 +0000 (17:12 -0700)]
Merge "Change ZoneCompator to generate the single "tzdata" file."
Elliott Hughes [Sat, 20 Oct 2012 00:07:45 +0000 (17:07 -0700)]
Merge "Update generate-NOTICE.py to know about tzdata."
The Android Automerger [Fri, 19 Oct 2012 22:45:58 +0000 (15:45 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Elliott Hughes [Fri, 19 Oct 2012 21:47:37 +0000 (14:47 -0700)]
Change ZoneCompator to generate the single "tzdata" file.
Also remove the obsolete individual files, and the temporary script
that converted between the formats.
Bug:
7012465
Change-Id: I5a4030098e4d53e747fd6d395df2679d1567ee1f
Elliott Hughes [Fri, 19 Oct 2012 21:55:19 +0000 (14:55 -0700)]
Update generate-NOTICE.py to know about tzdata.
Also regenerate the NOTICE files. One had slipped behind.
Bug:
7012465
Change-Id: Ice2e909b521472eb1acd53d8151038bebe19984a
Elliott Hughes [Fri, 19 Oct 2012 21:40:25 +0000 (14:40 -0700)]
am
e75c273a: Merge "Track the tzdata2012g update in the new file format."
* commit '
e75c273ac434043153f22b1c2f89c042928407bc':
Track the tzdata2012g update in the new file format.
Elliott Hughes [Fri, 19 Oct 2012 21:30:04 +0000 (14:30 -0700)]
Merge "Track the tzdata2012g update in the new file format."
Elliott Hughes [Fri, 19 Oct 2012 21:28:56 +0000 (14:28 -0700)]
Track the tzdata2012g update in the new file format.
Change-Id: Id18aeb1122df769d83c4be06fbf37681231e79f0
Elliott Hughes [Fri, 19 Oct 2012 20:51:19 +0000 (13:51 -0700)]
am
88cd1a21: Merge "Upgrade to tzdata2012g."
* commit '
88cd1a2188cde62d9f94881549791b7c197b2116':
Upgrade to tzdata2012g.
Elliott Hughes [Fri, 19 Oct 2012 20:51:18 +0000 (13:51 -0700)]
am
551ca77e: Merge "Do all the zoneinfo.* file generation in Java."
* commit '
551ca77e35098272abfe9484457827c661d23ef0':
Do all the zoneinfo.* file generation in Java.
Elliott Hughes [Fri, 19 Oct 2012 20:45:50 +0000 (13:45 -0700)]
Merge "Upgrade to tzdata2012g."
Elliott Hughes [Thu, 18 Oct 2012 23:34:48 +0000 (16:34 -0700)]
Upgrade to tzdata2012g.
This release reflects the following changes recently circulated on the tz
mailing list:
Samoa fall 2012 and later. (Thanks to Nicholas Pereira
and Robert Elz.)
Palestine fall 2012. (Thanks to Steffen Thorsen.)
This release does not reflect the possible changes discussed yesterday
for Tocantins and Bahia.
(cherry-pick of
f0e402dbd257ab495eab514b347db4b3d6844826.)
Change-Id: I8202292b11accedb811194a821dacf837a1bbd6e
Elliott Hughes [Fri, 19 Oct 2012 20:37:24 +0000 (13:37 -0700)]
Merge "Do all the zoneinfo.* file generation in Java."
Elliott Hughes [Fri, 19 Oct 2012 20:18:07 +0000 (13:18 -0700)]
am
2266e495: Merge "Switch bionic over to using libcore\'s copy of libcore.util.ZoneInfo."
* commit '
2266e4956f4b245903acd66f0cc32ec5caf5abae':
Switch bionic over to using libcore's copy of libcore.util.ZoneInfo.
Elliott Hughes [Fri, 19 Oct 2012 20:03:52 +0000 (13:03 -0700)]
Do all the zoneinfo.* file generation in Java.
Bug:
7012465
Change-Id: Ia5d5ad75db94d680a6b34ccc26eb68d5bd2bfc29
Elliott Hughes [Fri, 19 Oct 2012 20:01:04 +0000 (13:01 -0700)]
Merge "Switch bionic over to using libcore's copy of libcore.util.ZoneInfo."
Elliott Hughes [Fri, 19 Oct 2012 19:05:24 +0000 (12:05 -0700)]
Switch bionic over to using libcore's copy of libcore.util.ZoneInfo.
Bug:
7012465
Change-Id: I1225494c5d77a20fd48be1e904d8695ef95860e3
Elliott Hughes [Fri, 19 Oct 2012 16:59:52 +0000 (09:59 -0700)]
am
bc77942a: am
f0e402db: Upgrade to tzdata2012g.
* commit '
bc77942a9a5b2a30eb04fab495cb30ac21bb150d':
Upgrade to tzdata2012g.
Elliott Hughes [Fri, 19 Oct 2012 16:57:49 +0000 (09:57 -0700)]
am
f0e402db: Upgrade to tzdata2012g.
* commit '
f0e402dbd257ab495eab514b347db4b3d6844826':
Upgrade to tzdata2012g.
Elliott Hughes [Thu, 18 Oct 2012 23:34:48 +0000 (16:34 -0700)]
Upgrade to tzdata2012g.
This release reflects the following changes recently circulated on the tz
mailing list:
Samoa fall 2012 and later. (Thanks to Nicholas Pereira
and Robert Elz.)
Palestine fall 2012. (Thanks to Steffen Thorsen.)
This release does not reflect the possible changes discussed yesterday
for Tocantins and Bahia.
Change-Id: I52d9d2cd6e8e755885dc258200c014bee75527c9
Elliott Hughes [Thu, 18 Oct 2012 20:56:02 +0000 (13:56 -0700)]
am
10225071: Merge "Fixes x86 build."
* commit '
102250719f8aff443741e54ba5633c7722544620':
Fixes x86 build.
Elliott Hughes [Thu, 18 Oct 2012 20:43:40 +0000 (13:43 -0700)]
Merge "Fixes x86 build."
Elliott Hughes [Thu, 18 Oct 2012 20:42:59 +0000 (13:42 -0700)]
Fixes x86 build.
Change-Id: I0e576784b2224668d58ebea03986d534ee0e43b4
Elliott Hughes [Thu, 18 Oct 2012 20:37:54 +0000 (13:37 -0700)]
am
ca7466d2: Merge "Make bionic\'s dependency on the tzdata explicit."
* commit '
ca7466d2b8ee6baad86afc82fa18cda4d931b6d3':
Make bionic's dependency on the tzdata explicit.
Elliott Hughes [Thu, 18 Oct 2012 20:19:13 +0000 (13:19 -0700)]
Merge "Make bionic's dependency on the tzdata explicit."
Elliott Hughes [Thu, 18 Oct 2012 18:28:56 +0000 (11:28 -0700)]
Make bionic's dependency on the tzdata explicit.
Also stop building the obsolete three files, now bionic and libcore
both use the new single file.
Bug:
7012465
Change-Id: I1b9b49af7382c57b6cb8820c2275e6d4044b2bb6
Elliott Hughes [Thu, 18 Oct 2012 17:59:27 +0000 (10:59 -0700)]
am
5ae762a3: Merge "Pull bionic\'s time zone data from the new single \'tzdata\' file."
* commit '
5ae762a393168932602eb7269a7d30a53de1c83c':
Pull bionic's time zone data from the new single 'tzdata' file.
Elliott Hughes [Thu, 18 Oct 2012 17:48:10 +0000 (10:48 -0700)]
Merge "Pull bionic's time zone data from the new single 'tzdata' file."
Elliott Hughes [Thu, 18 Oct 2012 17:26:36 +0000 (10:26 -0700)]
am
9ffaabcc: Merge "Remove obsolete CHANGES.TXT and ISSUES.TXT."
* commit '
9ffaabcc49776676cb2ea60f0846f2c208f6d715':
Remove obsolete CHANGES.TXT and ISSUES.TXT.
Elliott Hughes [Thu, 18 Oct 2012 17:09:47 +0000 (10:09 -0700)]
Merge "Remove obsolete CHANGES.TXT and ISSUES.TXT."
Elliott Hughes [Wed, 17 Oct 2012 23:30:47 +0000 (16:30 -0700)]
Pull bionic's time zone data from the new single 'tzdata' file.
Bug:
7012465
Change-Id: Iec71e448bf7a40af30ca89150b3c336e67a44a43
Elliott Hughes [Wed, 17 Oct 2012 23:09:31 +0000 (16:09 -0700)]
am
32ea9fe5: Merge "Put all the tzdata in one file."
* commit '
32ea9fe5783e3cc9756205c0ac46482afc700a3d':
Put all the tzdata in one file.
Elliott Hughes [Wed, 17 Oct 2012 22:52:09 +0000 (15:52 -0700)]
Merge "Put all the tzdata in one file."