OSDN Git Service
Elliott Hughes [Fri, 13 Sep 2013 17:51:31 +0000 (10:51 -0700)]
am
9e6104d5: resolved conflicts for merge of
05292dd6 to jb-mr1-dev
* commit '
9e6104d54f541d43d3c1b785f2dfc1d2e09c0f2f':
Upgrade pre-jb-mr2 releases to tzdata2013d.
Elliott Hughes [Fri, 13 Sep 2013 17:17:10 +0000 (10:17 -0700)]
resolved conflicts for merge of
05292dd6 to jb-mr1-dev
Change-Id: I051cad5dc3c985f11c52708f4487e64ea45ca617
Elliott Hughes [Fri, 13 Sep 2013 17:09:56 +0000 (10:09 -0700)]
resolved conflicts for merge of
cc7f0dc5 to jb-dev-plus-aosp
Change-Id: I812d0007ddd1576583a4749461b57ee33fb1eb15
Elliott Hughes [Fri, 13 Sep 2013 16:43:15 +0000 (09:43 -0700)]
Upgrade pre-jb-mr2 releases to tzdata2013d.
From the release notes:
Changes affecting future time stamps:
Morocco's midsummer transitions this year are July 7 and August 10,
not July 9 and August 8. (Thanks to Andrew Paprocki.)
Israel now falls back on the last Sunday of October.
(Thanks to Ephraim Silverberg.)
Changes affecting past time stamps:
Specify Jerusalem's location more precisely; this changes the pre-1880
times by 2 s.
Changing affecting metadata only:
Fix typos in the entries for country codes BQ and SX.
Change-Id: I8caa139f0eecbe038643df43a27088278c6185cd
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:19:03 +0000 (12:19 -0700)]
am
e5412a9a: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
e5412a9a9597433ae2540b390269c514c46402f1':
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:15:11 +0000 (12:15 -0700)]
Reconcile with jb-mr1-release - do not merge
Naseer Ahmed [Tue, 20 Nov 2012 00:27:37 +0000 (19:27 -0500)]
msm_mdp: Update header for 4 layer support
Bug:
7626586
Change-Id: I37730470dc09b7a9d6336b1603f87efd98f45e97
Signed-off-by: Iliyan Malchev <malchev@google.com>
The Android Open Source Project [Tue, 6 Nov 2012 19:12:01 +0000 (11:12 -0800)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I8a58a6aebc81829d15af6802f16d956cad2d39c8
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 [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
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 [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
The Android Automerger [Thu, 11 Oct 2012 15:18:46 +0000 (08:18 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 10 Oct 2012 21:06:19 +0000 (14:06 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Ying Wang [Wed, 26 Sep 2012 01:32:24 +0000 (18:32 -0700)]
Set up the private variables.
Now we use private variables in transform-o-to-executable to support
build executables against the NDK.
Cherry-picked from master.
Bug:
7170098
Change-Id: Ic8f1d36a116fce24f3ea6a3ff5e9bfab6cafee99
The Android Automerger [Wed, 3 Oct 2012 13:59:12 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Naseer Ahmed [Mon, 1 Oct 2012 20:06:50 +0000 (16:06 -0400)]
bionic: update processed msm_mdp.h
-- Has display commit ioctl
Bug:
7274951
Change-Id: If2d47edf3ada418e8c61a2acc7b79fb3422f3473
Signed-off-by: Iliyan Malchev <malchev@google.com>
Andy McFadden [Tue, 2 Oct 2012 22:23:20 +0000 (15:23 -0700)]
Merge "Test flags before using "info"" into jb-mr1-dev
Andreas Huber [Tue, 2 Oct 2012 16:21:20 +0000 (09:21 -0700)]
bionic: update processed msm_vidc_enc.h
Updated kernel headers to support a video encoder ioctl to preprend each IDR
frame with SPS/PPS.
related-to-bug:
7245308
Change-Id: I7244c521690d69a905deb19940a04fd4f2e06935
Signed-off-by: Iliyan Malchev <malchev@google.com>
Andy McFadden [Tue, 2 Oct 2012 20:53:13 +0000 (13:53 -0700)]
Test flags before using "info"
Our debugger signal catcher expects to receive three args, but if
somebody cleared SA_SIGINFO we only get one, and bad things happen
when we try to use the second one. Test to see if SA_SIGINFO is
still set before we try to use the argument.
Bug:
7272866
Change-Id: If682a2262fe8a575f3802fb0c60a53eea3082456
The Android Automerger [Sun, 30 Sep 2012 13:59:14 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Saurabh Shah [Thu, 27 Sep 2012 19:27:53 +0000 (12:27 -0700)]
bionic: Update msm_mdp.h with new MSMFB_OVERLAY_COMMIT ioctl
This change adds msm_mdp.h header changes to bionic.
This IOCTL is a substitute for PAN on external panel. It waits for DMAE to
finish before returning and avoid delays in the PAN path.
Bug:
7249589
Acked-by: Arun Kumar K.R <akumarkr@codeaurora.org>
Change-Id: I4b04a4538919ffcb994699a432c4322e9f94e870
Signed-off-by: Iliyan Malchev <malchev@google.com>
The Android Automerger [Tue, 25 Sep 2012 13:59:12 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Elliott Hughes [Mon, 24 Sep 2012 17:13:12 +0000 (10:13 -0700)]
DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic."
This reverts commit
3a936a4980046a7eeb8d53a3296058d8f3a1f770.
We don't want this in jb-mr1.
Elliott Hughes [Mon, 24 Sep 2012 16:40:18 +0000 (09:40 -0700)]
am
ec432608: am
0c24effd: Merge "Add the libcutils localtime_tz and mktime_t extensions to bionic."
* commit '
ec4326084ed2a717b3e318f36c2675ef033c30ff':
Add the libcutils localtime_tz and mktime_t extensions to bionic.
Elliott Hughes [Mon, 24 Sep 2012 15:55:27 +0000 (08:55 -0700)]
am
0c24effd: Merge "Add the libcutils localtime_tz and mktime_t extensions to bionic."
* commit '
0c24effd01736e533fd082b2cf1de8926b0fe880':
Add the libcutils localtime_tz and mktime_t extensions to bionic.
Elliott Hughes [Mon, 24 Sep 2012 15:52:15 +0000 (08:52 -0700)]
am
2d51dddf: am
85049ead: Merge "Use hidden visibility for several internal-use-only functions."
* commit '
2d51dddf1a649c73f207ecf48d419fea8a8ed4de':
Use hidden visibility for several internal-use-only functions.
Elliott Hughes [Mon, 24 Sep 2012 15:52:14 +0000 (08:52 -0700)]
am
baa74eff: am
882c6af9: Merge "[MIPS] Add CONFIG_32BIT to kernel_default_arch_macros for MIPS. Some of the required structure definitons are defined under this macro."
* commit '
baa74eff0dd56b1dbf8e8a233a82e6382828ad72':
[MIPS] Add CONFIG_32BIT to kernel_default_arch_macros for MIPS. Some of the required structure definitons are defined under this macro.
Elliott Hughes [Mon, 24 Sep 2012 15:43:45 +0000 (08:43 -0700)]
am
85049ead: Merge "Use hidden visibility for several internal-use-only functions."
* commit '
85049ead251b0af9411ada3ad1db0f6b75f8e4a8':
Use hidden visibility for several internal-use-only functions.
Elliott Hughes [Mon, 24 Sep 2012 15:43:44 +0000 (08:43 -0700)]
am
882c6af9: Merge "[MIPS] Add CONFIG_32BIT to kernel_default_arch_macros for MIPS. Some of the required structure definitons are defined under this macro."
* commit '
882c6af953e5b3fd4b9f4fe74a68128ea16fba3b':
[MIPS] Add CONFIG_32BIT to kernel_default_arch_macros for MIPS. Some of the required structure definitons are defined under this macro.
Elliott Hughes [Mon, 24 Sep 2012 15:41:55 +0000 (08:41 -0700)]
Merge "Add the libcutils localtime_tz and mktime_t extensions to bionic."
Elliott Hughes [Sun, 23 Sep 2012 18:08:18 +0000 (11:08 -0700)]
Merge "Use hidden visibility for several internal-use-only functions."
The Android Automerger [Sat, 22 Sep 2012 16:41:22 +0000 (09:41 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Elliott Hughes [Sat, 22 Sep 2012 01:27:40 +0000 (18:27 -0700)]
Use hidden visibility for several internal-use-only functions.
Change-Id: Ibeea6963ff0cc06479d0a3ed7e868eeece8c55a0
Elliott Hughes [Sat, 22 Sep 2012 01:20:03 +0000 (18:20 -0700)]
Merge "[MIPS] Add CONFIG_32BIT to kernel_default_arch_macros for MIPS. Some of the required structure definitons are defined under this macro."
Raghu Gandham [Sat, 22 Sep 2012 00:13:25 +0000 (17:13 -0700)]
[MIPS] Add CONFIG_32BIT to kernel_default_arch_macros for MIPS.
Some of the required structure definitons are defined under this macro.
Change-Id: I7a9a986e371381697dcb56bd8ea362856ffa7509
The Android Automerger [Fri, 21 Sep 2012 13:59:14 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Naseer Ahmed [Mon, 17 Sep 2012 22:44:07 +0000 (18:44 -0400)]
bionic: Update MDP header for sync
Change-Id: I5e13cdc9132fd99b8072b2e0836b9a92bc54f9c3
Rebecca Schultz Zavin [Thu, 20 Sep 2012 07:17:34 +0000 (00:17 -0700)]
Update ion header to add FLAG_CACHED_NEEDS_SYNC
Bug:
6854979
Change-Id: Ic94c1b7b10ab750a6b4b0db83d2fb1fa073d91b9
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
The Android Automerger [Wed, 19 Sep 2012 14:01:27 +0000 (07:01 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Iliyan Malchev [Wed, 19 Sep 2012 03:27:34 +0000 (20:27 -0700)]
Merge "Update headers for Adreno graphics driver" into jb-mr1-dev
Jeff Boody [Sat, 15 Sep 2012 17:21:09 +0000 (11:21 -0600)]
Update headers for Adreno graphics driver
Change-Id: Ic66de698667c8c8607b2c19712a8626a4651da7f
Signed-off-by: Iliyan Malchev <malchev@google.com>
Elliott Hughes [Wed, 19 Sep 2012 00:18:39 +0000 (17:18 -0700)]
am
30289f0d: am
47dc4d43: Merge "Make pthread_create more forgiving of invalid sched_policy. Bug:
7005326"
* commit '
30289f0dd6ab644290bfb37b22b03b7d006628f4':
Make pthread_create more forgiving of invalid sched_policy. Bug:
7005326
Elliott Hughes [Wed, 19 Sep 2012 00:13:15 +0000 (17:13 -0700)]
am
47dc4d43: Merge "Make pthread_create more forgiving of invalid sched_policy. Bug:
7005326"
* commit '
47dc4d431017e701239dd7d9a16333e0ad56a0ac':
Make pthread_create more forgiving of invalid sched_policy. Bug:
7005326
Elliott Hughes [Tue, 18 Sep 2012 23:56:44 +0000 (16:56 -0700)]
Merge "Make pthread_create more forgiving of invalid sched_policy. Bug:
7005326"
Dave Burke [Tue, 18 Sep 2012 03:37:38 +0000 (20:37 -0700)]
Make pthread_create more forgiving of invalid sched_policy.
Bug:
7005326
(cherry-pick of
e58303249b9e799a4fe84c5a2dfe71518441a6ec.)
Change-Id: Ie81494e0f6a71caa6fd9fabbcfc47a23077554d6
The Android Automerger [Tue, 18 Sep 2012 13:59:21 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Dave Burke [Tue, 18 Sep 2012 03:37:38 +0000 (20:37 -0700)]
Make pthread_create more forgiving of invalid sched_policy.
Bug:
7005326
Change-Id: I4e33d8e7d70fbfcf8a1bcc0e4c33279b42092a0a
Elliott Hughes [Mon, 17 Sep 2012 22:53:22 +0000 (15:53 -0700)]
am
e2a17ef4: am
77ac158e: Merge "Don\'t copy strerror(3) or strsignal(3) strings if we can share."
* commit '
e2a17ef444e1d3b3e27e649440a320139038d1d9':
Don't copy strerror(3) or strsignal(3) strings if we can share.
Elliott Hughes [Mon, 17 Sep 2012 22:50:18 +0000 (15:50 -0700)]
am
77ac158e: Merge "Don\'t copy strerror(3) or strsignal(3) strings if we can share."
* commit '
77ac158e90712a975f61b7559b8de558f644f48d':
Don't copy strerror(3) or strsignal(3) strings if we can share.
Elliott Hughes [Mon, 17 Sep 2012 22:36:26 +0000 (15:36 -0700)]
Merge "Don't copy strerror(3) or strsignal(3) strings if we can share."
Elliott Hughes [Mon, 17 Sep 2012 22:23:35 +0000 (15:23 -0700)]
Don't copy strerror(3) or strsignal(3) strings if we can share.
Change-Id: Ic405269f63b945c6fb347e7c4346cd6f104aff35
The Android Automerger [Sun, 16 Sep 2012 13:59:15 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Elliott Hughes [Fri, 14 Sep 2012 23:21:18 +0000 (16:21 -0700)]
am
f8902bf7: am
047a285d: Merge "Fix <sys/klog.h> to correspond to the kernel operations."
* commit '
f8902bf7079be1a7ad51b82ebb24556ff40a1fff':
Fix <sys/klog.h> to correspond to the kernel operations.
Elliott Hughes [Fri, 14 Sep 2012 23:18:00 +0000 (16:18 -0700)]
am
047a285d: Merge "Fix <sys/klog.h> to correspond to the kernel operations."
* commit '
047a285d41e3fe0b1a8071ec19f436baf6f187b2':
Fix <sys/klog.h> to correspond to the kernel operations.
Elliott Hughes [Fri, 14 Sep 2012 23:14:48 +0000 (16:14 -0700)]
Merge "Fix <sys/klog.h> to correspond to the kernel operations."
Elliott Hughes [Fri, 14 Sep 2012 23:04:30 +0000 (16:04 -0700)]
am
950a3c01: am
51519521: Merge "Add tty defaults to bionic"
* commit '
950a3c010cfbb18bb5974a78040ab9946370e553':
Add tty defaults to bionic
Elliott Hughes [Fri, 14 Sep 2012 23:01:19 +0000 (16:01 -0700)]
am
51519521: Merge "Add tty defaults to bionic"
* commit '
51519521979c2daa417f6ca50c175e631c55dfb0':
Add tty defaults to bionic
Elliott Hughes [Fri, 14 Sep 2012 22:45:46 +0000 (15:45 -0700)]
Merge "Add tty defaults to bionic"
Elliott Hughes [Fri, 14 Sep 2012 22:42:30 +0000 (15:42 -0700)]
Fix <sys/klog.h> to correspond to the kernel operations.
This makes the constants correspond to those in the Linux kernel's
include/linux/syslog.h, but keeping our old badly-named constants for
source compatibility.
Change-Id: Ia47d1299205754cbfffd29ed48b497b53d1edaae
The Android Automerger [Fri, 14 Sep 2012 14:11:00 +0000 (07:11 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Elliott Hughes [Fri, 14 Sep 2012 00:12:40 +0000 (17:12 -0700)]
am
66a97ea9: am
4e9d953a: Merge "libc: add ftw / nftw functions"
* commit '
66a97ea9fbc96c8ebf7f9aae8c2512ec3ffbdb80':
libc: add ftw / nftw functions
Elliott Hughes [Fri, 14 Sep 2012 00:12:39 +0000 (17:12 -0700)]
am
77fd7075: am
e895e6de: Merge "Update libc/NOTICE and record the incantation."
* commit '
77fd70758ae579aadf153124f7c26494e4a54988':
Update libc/NOTICE and record the incantation.
Elliott Hughes [Fri, 14 Sep 2012 00:09:51 +0000 (17:09 -0700)]
am
4e9d953a: Merge "libc: add ftw / nftw functions"
* commit '
4e9d953a0e9334c0f3519f470b97973c31da5bb6':
libc: add ftw / nftw functions
Elliott Hughes [Fri, 14 Sep 2012 00:09:50 +0000 (17:09 -0700)]
am
e895e6de: Merge "Update libc/NOTICE and record the incantation."
* commit '
e895e6deaab620f874b3e9f196eb6b67f58dc278':
Update libc/NOTICE and record the incantation.
Elliott Hughes [Thu, 13 Sep 2012 23:55:39 +0000 (16:55 -0700)]
Merge "libc: add ftw / nftw functions"
Nick Kralevich [Wed, 12 Sep 2012 20:21:25 +0000 (13:21 -0700)]
libc: add ftw / nftw functions
Please see "man 3 ftw" for a description of the
ftw / nftw functions.
This code is taken directly from netbsd unmodified.
Change-Id: Ia4879ac57212b424adf5281b5e92858e216d0f14
Elliott Hughes [Thu, 13 Sep 2012 23:52:34 +0000 (16:52 -0700)]
Merge "Update libc/NOTICE and record the incantation."
Elliott Hughes [Thu, 13 Sep 2012 23:51:57 +0000 (16:51 -0700)]
Update libc/NOTICE and record the incantation.
Change-Id: I0673d6263de2c5a21cd549f18c0648d0fa4bb40f
Kenny Root [Thu, 13 Sep 2012 22:33:57 +0000 (15:33 -0700)]
am
a4ea1a3d: am
f7e403d6: Merge changes I06ee0b67,I914d2205
* commit '
a4ea1a3d2e12f8b240a70d90ddf1f54af06c286c':
Print out shared app gids correctly
Add tests for Android-specific stubs
Elliott Hughes [Thu, 13 Sep 2012 22:33:57 +0000 (15:33 -0700)]
am
de9db8f7: am
fa36875d: Merge "Make strerror(3) and strsignal(3) thread-safe, and add psignal(3) and psiginfo(3)."
* commit '
de9db8f7efb10cdab1c81f1d3164f3b55e5f08e9':
Make strerror(3) and strsignal(3) thread-safe, and add psignal(3) and psiginfo(3).
Elliott Hughes [Thu, 13 Sep 2012 22:33:56 +0000 (15:33 -0700)]
am
d4623e56: am
b338ea30: Merge "Upgrade to tzdata2012f."
* commit '
d4623e56fb61b38e2c436f214a1282252908b93b':
Upgrade to tzdata2012f.
Kenny Root [Thu, 13 Sep 2012 22:30:35 +0000 (15:30 -0700)]
am
f7e403d6: Merge changes I06ee0b67,I914d2205
* commit '
f7e403d66355faed93bb1472f6961acd380796d1':
Print out shared app gids correctly
Add tests for Android-specific stubs
Elliott Hughes [Thu, 13 Sep 2012 22:30:34 +0000 (15:30 -0700)]
am
fa36875d: Merge "Make strerror(3) and strsignal(3) thread-safe, and add psignal(3) and psiginfo(3)."
* commit '
fa36875df423af968d053c584c0de18a2448516b':
Make strerror(3) and strsignal(3) thread-safe, and add psignal(3) and psiginfo(3).
Elliott Hughes [Thu, 13 Sep 2012 22:30:33 +0000 (15:30 -0700)]
am
b338ea30: Merge "Upgrade to tzdata2012f."
* commit '
b338ea30b299099a2b26a4e8a6b2ccd7bfac631a':
Upgrade to tzdata2012f.
Kenny Root [Thu, 13 Sep 2012 22:26:13 +0000 (15:26 -0700)]
Merge changes I06ee0b67,I914d2205
* changes:
Print out shared app gids correctly
Add tests for Android-specific stubs
Kenny Root [Thu, 13 Sep 2012 21:31:50 +0000 (14:31 -0700)]
Print out shared app gids correctly
For applications that share resources across users such as
forward-locked applications, print out their group name correctly.
Change-Id: I06ee0b67e4325cfa415ffd7a03e301700399a66d
Kenny Root [Thu, 13 Sep 2012 17:52:52 +0000 (10:52 -0700)]
Add tests for Android-specific stubs
Also fix problem with multi-user IDs that the home directory was
returned as "/data" instead of "/" unlike all the other uids.
Change-Id: I914d22052e5a86552989f8969b85aadbc748c65d
Elliott Hughes [Thu, 13 Sep 2012 22:19:36 +0000 (15:19 -0700)]
Merge "Make strerror(3) and strsignal(3) thread-safe, and add psignal(3) and psiginfo(3)."
Irina Tirdea [Sat, 8 Sep 2012 06:17:54 +0000 (09:17 +0300)]
Make strerror(3) and strsignal(3) thread-safe, and add psignal(3) and psiginfo(3).
Change-Id: I426109db25e907980d6cb3a7a695796e45783b78
Elliott Hughes [Thu, 13 Sep 2012 22:15:08 +0000 (15:15 -0700)]
Merge "Upgrade to tzdata2012f."
Elliott Hughes [Thu, 13 Sep 2012 21:54:51 +0000 (14:54 -0700)]
Upgrade to tzdata2012f.
This release reflects the following change circulated on the tz
mailing list:
* australasia (Pacific/Fiji): Fiji DST is October 21 through January
20 this year. (Thanks to Steffen Thorsen.)
Change-Id: Ie21ea791ff5191264967aff685cbfa5c73f1fa5c
Elliott Hughes [Thu, 13 Sep 2012 18:11:54 +0000 (11:11 -0700)]
am
8db4b91b: am
d2236e2c: Merge "Fix Mac build."
* commit '
8db4b91bd2a069b2afb377f7e5190f625c3002cf':
Fix Mac build.
Elliott Hughes [Thu, 13 Sep 2012 18:09:49 +0000 (11:09 -0700)]
am
d2236e2c: Merge "Fix Mac build."
* commit '
d2236e2c0717818e150215b4eee7af58cd3540d8':
Fix Mac build.
Elliott Hughes [Thu, 13 Sep 2012 18:02:22 +0000 (11:02 -0700)]
Merge "Fix Mac build."
Elliott Hughes [Thu, 13 Sep 2012 18:01:46 +0000 (11:01 -0700)]
Fix Mac build.
Change-Id: Id625806fab0f2f7f90f9508c5fce649afe970414
Elliott Hughes [Thu, 13 Sep 2012 16:52:38 +0000 (09:52 -0700)]
am
b2550dd4: am
4a9b7c69: Merge "Add libdl into libc_malloc_debug_leak build"
* commit '
b2550dd4c85845974bf61d3e4071b2b957fbcf09':
Add libdl into libc_malloc_debug_leak build
Elliott Hughes [Thu, 13 Sep 2012 16:52:37 +0000 (09:52 -0700)]
am
58d15966: am
af4d630e: Merge "Added new test for dlopen which is failing for MIPS."
* commit '
58d15966c8f95998f82a90a5b24e23d56ba6254f':
Added new test for dlopen which is failing for MIPS.
Elliott Hughes [Thu, 13 Sep 2012 16:47:52 +0000 (09:47 -0700)]
am
4a9b7c69: Merge "Add libdl into libc_malloc_debug_leak build"
* commit '
4a9b7c694a8312160d3cd953a8227c23a1624868':
Add libdl into libc_malloc_debug_leak build
Elliott Hughes [Thu, 13 Sep 2012 16:47:51 +0000 (09:47 -0700)]
am
af4d630e: Merge "Added new test for dlopen which is failing for MIPS."
* commit '
af4d630e4d87dca38cc2026b992bb50c49911db9':
Added new test for dlopen which is failing for MIPS.
Elliott Hughes [Thu, 13 Sep 2012 16:46:30 +0000 (09:46 -0700)]
Merge "Add libdl into libc_malloc_debug_leak build"
Elliott Hughes [Thu, 13 Sep 2012 16:42:49 +0000 (09:42 -0700)]
Merge "Added new test for dlopen which is failing for MIPS."
The Android Automerger [Thu, 13 Sep 2012 13:59:18 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Pavel Chupin [Mon, 10 Sep 2012 15:35:25 +0000 (19:35 +0400)]
Add libdl into libc_malloc_debug_leak build
Otherwise libc_malloc_debug_leak.so is failed to load runtime in x86
case
Change-Id: I8207ce06d1ec17b233f4e4fcfdd2b161673b4fa8
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
jeffhao [Thu, 13 Sep 2012 00:25:30 +0000 (17:25 -0700)]
Added new test for dlopen which is failing for MIPS.
Change-Id: I2240faefb387a11647f49b1a15699907a40f98c1
Elliott Hughes [Wed, 12 Sep 2012 23:08:14 +0000 (16:08 -0700)]
resolved conflicts for merge of
47bda0c2 to jb-mr1-dev
Change-Id: Ia1969c79111c006bde709920254a515646c20aa7
Elliott Hughes [Wed, 12 Sep 2012 22:59:29 +0000 (15:59 -0700)]
am
7593fa8e: Merge "Update the kernel headers to match external/kernel-headers."
* commit '
7593fa8eb7d8c3950a069e5edd244fb68872ec17':
Update the kernel headers to match external/kernel-headers.
Elliott Hughes [Wed, 12 Sep 2012 22:56:10 +0000 (15:56 -0700)]
Merge "Update the kernel headers to match external/kernel-headers."
Elliott Hughes [Wed, 12 Sep 2012 02:03:02 +0000 (19:03 -0700)]
Update the kernel headers to match external/kernel-headers.
Note that the Linux kernel handed over responsibility for most of the
socket constants to glibc some time ago. Someone had updated our
external/kernel-headers file but not regenerated the bionic headers,
so this change copies the missing stuff from the old bionic <linux/socket.h>
into <sys/socket.h>. This is what glibc does.
I've hacked a few of the other files to #include <sys/socket.h> for
backward compatibility, but even so this requires numerous other
changes to switch people over from direct inclusion of <linux/...> headers.
Change-Id: I0e4af64e631d3cef911a31d90f2f806e058278a0
Elliott Hughes [Wed, 12 Sep 2012 18:07:12 +0000 (11:07 -0700)]
am
90ae787b: am
666d06fe: Merge "Backwards and forwards compatibility for an upcoming <sys/socket.h> change."
* commit '
90ae787b30890dc7d0f5d95b67ea5578d53bd61e':
Backwards and forwards compatibility for an upcoming <sys/socket.h> change.