OSDN Git Service
Yabin Cui [Sat, 14 Feb 2015 02:46:43 +0000 (02:46 +0000)]
am
4812bdf1: am
4181cc69: Merge "Declare getgrent/setgrent/endgrent as missing."
* commit '
4812bdf1b160fb803dd86a393daf2ae725029c2e':
Declare getgrent/setgrent/endgrent as missing.
Yabin Cui [Sat, 14 Feb 2015 02:42:32 +0000 (02:42 +0000)]
am
4181cc69: Merge "Declare getgrent/setgrent/endgrent as missing."
* commit '
4181cc691e36546c556274d46d389d7e0cb9cfab':
Declare getgrent/setgrent/endgrent as missing.
Yabin Cui [Sat, 14 Feb 2015 02:37:19 +0000 (02:37 +0000)]
Merge "Declare getgrent/setgrent/endgrent as missing."
Dmitriy Ivanov [Sat, 14 Feb 2015 00:49:33 +0000 (00:49 +0000)]
am
88117127: am
b81a871c: Merge changes I88827aa0,Ib0b0987a
* commit '
88117127defa6aeb26840ec8547486aefd5edd73':
Fix: DT_DEBUG was acting as DT_REL on mips64
Add missing SHT_LOOS/SHT_HIOS values
Dmitriy Ivanov [Sat, 14 Feb 2015 00:43:56 +0000 (00:43 +0000)]
am
b81a871c: Merge changes I88827aa0,Ib0b0987a
* commit '
b81a871cbb2d99168bdb8380b6142139135f418f':
Fix: DT_DEBUG was acting as DT_REL on mips64
Add missing SHT_LOOS/SHT_HIOS values
Dmitriy Ivanov [Sat, 14 Feb 2015 00:38:03 +0000 (00:38 +0000)]
Merge changes I88827aa0,Ib0b0987a
* changes:
Fix: DT_DEBUG was acting as DT_REL on mips64
Add missing SHT_LOOS/SHT_HIOS values
Dmitriy Ivanov [Sat, 14 Feb 2015 00:29:50 +0000 (16:29 -0800)]
Fix: DT_DEBUG was acting as DT_REL on mips64
Change-Id: I88827aa07d75d06d606c987e6270fcca3ae6216f
Dmitriy Ivanov [Sat, 14 Feb 2015 00:25:43 +0000 (16:25 -0800)]
Add missing SHT_LOOS/SHT_HIOS values
Change-Id: Ib0b0987a7e85af7863c6ef894263b5980e32344d
Colin Cross [Fri, 13 Feb 2015 20:29:34 +0000 (20:29 +0000)]
am
d6a9f804: am
150403ca: Merge "Make .note.android.ident section type SH_NOTE"
* commit '
d6a9f804a9c95942bddc9afa243c339d72371008':
Make .note.android.ident section type SH_NOTE
Colin Cross [Fri, 13 Feb 2015 20:23:24 +0000 (20:23 +0000)]
am
150403ca: Merge "Make .note.android.ident section type SH_NOTE"
* commit '
150403caa8135bef5d5df37e288276ac4f95a234':
Make .note.android.ident section type SH_NOTE
Yabin Cui [Fri, 13 Feb 2015 18:52:35 +0000 (10:52 -0800)]
Declare getgrent/setgrent/endgrent as missing.
Bug:
19340053
Change-Id: I42bfeda95e6f262e2e74ab47336ea346c2de7e4a
Colin Cross [Fri, 13 Feb 2015 18:38:02 +0000 (18:38 +0000)]
Merge "Make .note.android.ident section type SH_NOTE"
Colin Cross [Fri, 13 Feb 2015 01:03:22 +0000 (17:03 -0800)]
Make .note.android.ident section type SH_NOTE
The .note.android.ident section is only used by GDB, which doesn't
care what section type the section is, but it would be convenient
for readelf -n to be able to find the section too.
The old way of getting the .note.android.ident section to be of type
SH_NOTE involved compiling from .c to .s using gcc, running sed to
change progbits to note, and then compiling from .s to .o using gcc.
Since crtbrand.c only contains a section containing data, a
crtbrand.S can be checked in that will compile on all platforms,
avoiding the need for sed.
Also add crtbrand.o to crtbegin_so.o so that libraries also get
the note, and to the crt workaround in arm libc.so.
Change-Id: Ica71942a6af4553b56978ceaa288b3f4c15ebfa2
Mark Salyzyn [Thu, 12 Feb 2015 21:03:12 +0000 (21:03 +0000)]
am
fdea643a: am
f9fb52ab: Merge "bionic: benchmarks: Add BM_semaphore_sem_post_sem_wait"
* commit '
fdea643af96379b5a19968d91ba6dc1758d8dcdf':
bionic: benchmarks: Add BM_semaphore_sem_post_sem_wait
Mark Salyzyn [Thu, 12 Feb 2015 20:57:41 +0000 (20:57 +0000)]
am
f9fb52ab: Merge "bionic: benchmarks: Add BM_semaphore_sem_post_sem_wait"
* commit '
f9fb52ab309c97d5b2ef4f8e1daff3eed4cf4024':
bionic: benchmarks: Add BM_semaphore_sem_post_sem_wait
Mark Salyzyn [Thu, 12 Feb 2015 20:52:57 +0000 (20:52 +0000)]
Merge "bionic: benchmarks: Add BM_semaphore_sem_post_sem_wait"
Colin Cross [Thu, 12 Feb 2015 18:26:53 +0000 (18:26 +0000)]
am
baf16422: am
362d6779: Merge "Remove no-op sed step when compiling crtbrand.o"
* commit '
baf164221b1356fe13091c2ca4b357da9a4e237c':
Remove no-op sed step when compiling crtbrand.o
Colin Cross [Thu, 12 Feb 2015 18:23:08 +0000 (18:23 +0000)]
am
362d6779: Merge "Remove no-op sed step when compiling crtbrand.o"
* commit '
362d677924a5f92190884ff225fe64820ad5d997':
Remove no-op sed step when compiling crtbrand.o
Colin Cross [Thu, 12 Feb 2015 18:16:47 +0000 (18:16 +0000)]
Merge "Remove no-op sed step when compiling crtbrand.o"
Mark Salyzyn [Tue, 10 Feb 2015 16:34:35 +0000 (08:34 -0800)]
bionic: benchmarks: Add BM_semaphore_sem_post_sem_wait
This test reports the overhead of sem_post to sem_wake for a low thread count
and a high thread count.
Change-Id: Ic30dcc8a78d754979117446bf3a28b7575cabac7
Colin Cross [Thu, 12 Feb 2015 01:40:45 +0000 (17:40 -0800)]
Remove no-op sed step when compiling crtbrand.o
crtbrand.c was compiled to a .s file, run through a sed script
to translate a %progbits to %note, and the compiled to .o.
However, when the sed command was copied from the original source
it was not updated to use the new name of the section (.note.ABI-tag
to .note.android.ident), so it didn't modify the file. Since the
section has been generated with type %progbits instead of %note for
two years, just delete the whole sed step.
Change-Id: Id78582e9b43b628afec4eed22a088283132f0742
Christopher Ferris [Wed, 11 Feb 2015 21:21:48 +0000 (21:21 +0000)]
am
2c0e462f: am
0046c39f: Merge "[MIPS] Fix Mips64 build of libm"
* commit '
2c0e462f9819587b6376ed90f315e4d6c0b13612':
[MIPS] Fix Mips64 build of libm
Christopher Ferris [Wed, 11 Feb 2015 21:15:45 +0000 (21:15 +0000)]
am
0046c39f: Merge "[MIPS] Fix Mips64 build of libm"
* commit '
0046c39f9ed6d7335f06e4d866df5ae0e7b4d485':
[MIPS] Fix Mips64 build of libm
Christopher Ferris [Wed, 11 Feb 2015 21:07:46 +0000 (21:07 +0000)]
Merge "[MIPS] Fix Mips64 build of libm"
Duane Sand [Wed, 11 Feb 2015 20:51:42 +0000 (12:51 -0800)]
[MIPS] Fix Mips64 build of libm
Change-Id: Ib742b408d4f21d5ec8d455a3fea7c08165c7f321
Elliott Hughes [Tue, 10 Feb 2015 23:46:48 +0000 (23:46 +0000)]
am
fac5e95c: am
ddae78fb: Merge "Fix our ftw tests."
* commit '
fac5e95c218381cb0c5748aadf70adfcc9414f83':
Fix our ftw tests.
Elliott Hughes [Tue, 10 Feb 2015 23:40:39 +0000 (23:40 +0000)]
am
ddae78fb: Merge "Fix our ftw tests."
* commit '
ddae78fba1ef7291d6a84bce11b0b8fff46f3547':
Fix our ftw tests.
Elliott Hughes [Tue, 10 Feb 2015 23:34:18 +0000 (23:34 +0000)]
Merge "Fix our ftw tests."
Elliott Hughes [Tue, 10 Feb 2015 22:15:33 +0000 (14:15 -0800)]
Fix our ftw tests.
SELinux denies access to some files in /sys, so we can't just trawl
through that asserting general truths. Instead, create a small known
tree.
Sadly neither ftw nor nftw takes user callback data, otherwise it would
be nice to assert that we visit all the expected nodes.
Bug:
19252748
Change-Id: Ib5309c38aaef53e6030281191a265a8d5a619044
Yabin Cui [Tue, 10 Feb 2015 18:09:57 +0000 (18:09 +0000)]
am
3a31e697: am
ee17e880: Merge "Define MAXHOSTNAMELEN explicitly in source files."
* commit '
3a31e697ca3c1207bfec64b555bcff7b129348a3':
Define MAXHOSTNAMELEN explicitly in source files.
Yabin Cui [Tue, 10 Feb 2015 18:00:39 +0000 (18:00 +0000)]
am
ee17e880: Merge "Define MAXHOSTNAMELEN explicitly in source files."
* commit '
ee17e8800418a74e21dba11658234363cf6f6032':
Define MAXHOSTNAMELEN explicitly in source files.
Yabin Cui [Tue, 10 Feb 2015 17:51:33 +0000 (17:51 +0000)]
Merge "Define MAXHOSTNAMELEN explicitly in source files."
Mark Salyzyn [Tue, 10 Feb 2015 16:54:32 +0000 (16:54 +0000)]
am
445c2020: am
a57fd419: Merge "bionic: benchmarks: Add BM_semaphore_sem_post"
* commit '
445c202073f4fd35e1171dc11bcd13a7accf7018':
bionic: benchmarks: Add BM_semaphore_sem_post
Christopher Ferris [Tue, 10 Feb 2015 16:53:33 +0000 (16:53 +0000)]
am
6fd3bcf6: am
6d99da04: Merge "Cleanup the libm makefile."
* commit '
6fd3bcf6ce2290f4e44547fb875af4ac3c741130':
Cleanup the libm makefile.
Yabin Cui [Tue, 10 Feb 2015 16:53:28 +0000 (16:53 +0000)]
am
fa592b2a: am
e375ecaa: Merge "Switch pthread_cond_t to <stdatomic.h>."
* commit '
fa592b2a903a6e5110c6daf0959cc7211fc476d7':
Switch pthread_cond_t to <stdatomic.h>.
Yabin Cui [Tue, 10 Feb 2015 16:51:48 +0000 (16:51 +0000)]
am
6a32443a: am
a4fc89ba: Merge "Stop including <linux/param.h> in <sys/param.h>."
* commit '
6a32443aa3e2544000314adf80d4e081d36d170d':
Stop including <linux/param.h> in <sys/param.h>.
Narayan Kamath [Tue, 10 Feb 2015 16:51:44 +0000 (16:51 +0000)]
am
e163cb28: am
f69139e1: Merge "Remove stray log line."
* commit '
e163cb28b9b89f315000c1c480ee0cb2b3c26744':
Remove stray log line.
Mark Salyzyn [Tue, 10 Feb 2015 15:24:48 +0000 (15:24 +0000)]
am
a57fd419: Merge "bionic: benchmarks: Add BM_semaphore_sem_post"
* commit '
a57fd419bc56add6752cd9fa6f53fe2b43dff019':
bionic: benchmarks: Add BM_semaphore_sem_post
Mark Salyzyn [Tue, 10 Feb 2015 15:16:33 +0000 (15:16 +0000)]
Merge "bionic: benchmarks: Add BM_semaphore_sem_post"
Yabin Cui [Mon, 9 Feb 2015 21:58:28 +0000 (13:58 -0800)]
Define MAXHOSTNAMELEN explicitly in source files.
Bug:
19093777
Bug:
19092844
Change-Id: I0778507ca2d5c008abb9a6d6315d0909263a8817
Mark Salyzyn [Mon, 9 Feb 2015 16:18:10 +0000 (08:18 -0800)]
bionic: benchmarks: Add BM_semaphore_sem_post
This test tries its best to report the producer side underlying futex
wake syscall overhead wthin sem_post. It does not measure the time it
takes for the wakeup to propagate to the consumer. It suffers from
clock_gettime syscall overhead, so subtract that. Lock the CPU speed
for consistent results as we may not reach >50% cpu utilization.
Change-Id: I02fa9dab2e6ac27202f0290115150bd3c8de00f2
Christopher Ferris [Tue, 10 Feb 2015 00:38:39 +0000 (00:38 +0000)]
am
6d99da04: Merge "Cleanup the libm makefile."
* commit '
6d99da0477f8589df01307067823c3925e40bd91':
Cleanup the libm makefile.
Christopher Ferris [Tue, 10 Feb 2015 00:31:05 +0000 (00:31 +0000)]
Merge "Cleanup the libm makefile."
Yabin Cui [Tue, 10 Feb 2015 00:18:47 +0000 (00:18 +0000)]
am
e375ecaa: Merge "Switch pthread_cond_t to <stdatomic.h>."
* commit '
e375ecaa39213ec01464dac9d0ffebaac70b4e9d':
Switch pthread_cond_t to <stdatomic.h>.
Yabin Cui [Tue, 10 Feb 2015 00:10:45 +0000 (00:10 +0000)]
Merge "Switch pthread_cond_t to <stdatomic.h>."
Yabin Cui [Thu, 29 Jan 2015 20:13:33 +0000 (12:13 -0800)]
Switch pthread_cond_t to <stdatomic.h>.
Bug:
17574458
Change-Id: Ic7f79861df4fe751cfa6c6b20b71123cc31e7114
Christopher Ferris [Fri, 23 Jan 2015 01:16:33 +0000 (17:16 -0800)]
Cleanup the libm makefile.
Change-Id: I3d95f75da24ee3b064a9cce67586b0e6f32272d8
Yabin Cui [Mon, 9 Feb 2015 19:52:51 +0000 (19:52 +0000)]
am
a4fc89ba: Merge "Stop including <linux/param.h> in <sys/param.h>."
* commit '
a4fc89badf4ef4d42df0927340c6f0d02167a3d6':
Stop including <linux/param.h> in <sys/param.h>.
Yabin Cui [Mon, 9 Feb 2015 19:46:45 +0000 (19:46 +0000)]
Merge "Stop including <linux/param.h> in <sys/param.h>."
Narayan Kamath [Mon, 9 Feb 2015 19:05:16 +0000 (19:05 +0000)]
am
f69139e1: Merge "Remove stray log line."
* commit '
f69139e105ef32199afdf35027e9dfc48ad215d7':
Remove stray log line.
Narayan Kamath [Mon, 9 Feb 2015 18:57:50 +0000 (18:57 +0000)]
Merge "Remove stray log line."
Narayan Kamath [Mon, 9 Feb 2015 17:59:22 +0000 (17:59 +0000)]
Remove stray log line.
Change-Id: Id948ae37a91dadd9d40e91de97f18774bdccfc78
Christopher Ferris [Sat, 7 Feb 2015 02:30:28 +0000 (02:30 +0000)]
am
6880ec44: am
d687905f: Merge "Display errors instead of running infinitely."
* commit '
6880ec44c339a720ebc9128fb6a11362ca7d5634':
Display errors instead of running infinitely.
Christopher Ferris [Sat, 7 Feb 2015 02:24:36 +0000 (02:24 +0000)]
am
d687905f: Merge "Display errors instead of running infinitely."
* commit '
d687905f11102a7f6bad461b6f501dc870c59999':
Display errors instead of running infinitely.
Christopher Ferris [Sat, 7 Feb 2015 02:18:39 +0000 (02:18 +0000)]
Merge "Display errors instead of running infinitely."
Christopher Ferris [Tue, 3 Feb 2015 23:16:03 +0000 (15:16 -0800)]
Display errors instead of running infinitely.
When there is an error detected, the code runs forever and then times
out without any indication of what happened. Change it so that error
messages are printed and the test fails.
Change-Id: Id3160fc2f394984de0157356594fd8b40de66b4a
Tao Bao [Fri, 6 Feb 2015 23:39:23 +0000 (23:39 +0000)]
am
35947160: am
bc64d1d1: Merge "Switch kernel header parsing to python libclang"
* commit '
35947160f96931a6464a9425b04f79232b389ed0':
Switch kernel header parsing to python libclang
Tao Bao [Fri, 6 Feb 2015 23:32:43 +0000 (23:32 +0000)]
am
bc64d1d1: Merge "Switch kernel header parsing to python libclang"
* commit '
bc64d1d1fd12a0b43bcfe3f88698f29185ab63e0':
Switch kernel header parsing to python libclang
Colin Cross [Fri, 6 Feb 2015 23:31:35 +0000 (23:31 +0000)]
am
0ef78e38: am
44e88db1: Merge "Use LOCAL_C_INCLUDES instead of LOCAL_CFLAGS for include dirs"
* commit '
0ef78e3840b3bfcc07a13d7ffa69dfdd8313e80c':
Use LOCAL_C_INCLUDES instead of LOCAL_CFLAGS for include dirs
Tao Bao [Fri, 6 Feb 2015 23:25:29 +0000 (23:25 +0000)]
Merge "Switch kernel header parsing to python libclang"
Colin Cross [Fri, 6 Feb 2015 22:53:18 +0000 (22:53 +0000)]
am
44e88db1: Merge "Use LOCAL_C_INCLUDES instead of LOCAL_CFLAGS for include dirs"
* commit '
44e88db185cc65b49373dd76d8ed27264b7299ed':
Use LOCAL_C_INCLUDES instead of LOCAL_CFLAGS for include dirs
Tao Bao [Wed, 28 Jan 2015 18:07:51 +0000 (10:07 -0800)]
Switch kernel header parsing to python libclang
Replace the tokenizer in cpp.py with libclang.
Bug:
18937958
Change-Id: I27630904c6d2849418cd5ca3d3c612ec3078686d
Colin Cross [Fri, 6 Feb 2015 22:45:59 +0000 (22:45 +0000)]
Merge "Use LOCAL_C_INCLUDES instead of LOCAL_CFLAGS for include dirs"
Colin Cross [Fri, 6 Feb 2015 22:16:17 +0000 (14:16 -0800)]
Use LOCAL_C_INCLUDES instead of LOCAL_CFLAGS for include dirs
Change-Id: If61d6faae5d91c3bbe198e733e5922cd877ba353
Yabin Cui [Thu, 5 Feb 2015 22:08:49 +0000 (22:08 +0000)]
am
da73dac7: am
bda85a12: Merge "Add path separator in bionic-unit-tests program path."
* commit '
da73dac7acce09b76bd6d811c8be694e69acbd17':
Add path separator in bionic-unit-tests program path.
Yabin Cui [Thu, 5 Feb 2015 22:01:41 +0000 (22:01 +0000)]
am
bda85a12: Merge "Add path separator in bionic-unit-tests program path."
* commit '
bda85a12392b10555dc03ac377c8450b8f0790d6':
Add path separator in bionic-unit-tests program path.
Yabin Cui [Thu, 5 Feb 2015 21:55:18 +0000 (21:55 +0000)]
Merge "Add path separator in bionic-unit-tests program path."
Elliott Hughes [Thu, 5 Feb 2015 20:31:07 +0000 (20:31 +0000)]
am
87c44930: am
9dfb00c1: Merge "Use the libcxxabi __cxa_demangle."
* commit '
87c44930486af960de27996d94b742f19399b82b':
Use the libcxxabi __cxa_demangle.
Elliott Hughes [Thu, 5 Feb 2015 20:31:06 +0000 (20:31 +0000)]
am
1ec1bbda: am
9a9b6357: Merge "Apparently, logd does need the NULs."
* commit '
1ec1bbda7f254266653a0db470f6e5d699a0cad1':
Apparently, logd does need the NULs.
Elliott Hughes [Thu, 5 Feb 2015 20:26:21 +0000 (20:26 +0000)]
am
9dfb00c1: Merge "Use the libcxxabi __cxa_demangle."
* commit '
9dfb00c1d48545a2627c2aded62d3a79749351fb':
Use the libcxxabi __cxa_demangle.
Elliott Hughes [Thu, 5 Feb 2015 20:22:39 +0000 (20:22 +0000)]
am
9a9b6357: Merge "Apparently, logd does need the NULs."
* commit '
9a9b635745dc776dcfeec51d68b85ca7e8cdbe7d':
Apparently, logd does need the NULs.
Elliott Hughes [Thu, 5 Feb 2015 20:21:35 +0000 (20:21 +0000)]
Merge "Use the libcxxabi __cxa_demangle."
Elliott Hughes [Thu, 5 Feb 2015 20:05:45 +0000 (20:05 +0000)]
Merge "Apparently, logd does need the NULs."
Elliott Hughes [Thu, 5 Feb 2015 20:05:34 +0000 (12:05 -0800)]
Use the libcxxabi __cxa_demangle.
Bug:
18930951
Change-Id: If2ea3633ac6dfd4ec975c0f16bdf3dd58e05c614
Elliott Hughes [Thu, 5 Feb 2015 20:02:04 +0000 (12:02 -0800)]
Apparently, logd does need the NULs.
Change-Id: I04b834e65c26c5821b952f78a0de7f92527cbdba
Yabin Cui [Thu, 5 Feb 2015 18:47:26 +0000 (18:47 +0000)]
am
ffcabed4: am
63826658: Merge "Add signal handling in bionic gtest main."
* commit '
ffcabed4bf8555e721c215a5140e2c8120add8af':
Add signal handling in bionic gtest main.
Dimitry Ivanov [Thu, 5 Feb 2015 18:47:07 +0000 (18:47 +0000)]
am
a1d3aa1f: am
8e5f9bc8: Merge "linker: Use load_bias to adjust search address in elf_addr_lookup"
* commit '
a1d3aa1f9579eaf579f579b43f836635fc9a5674':
linker: Use load_bias to adjust search address in elf_addr_lookup
Colin Cross [Thu, 5 Feb 2015 18:47:07 +0000 (18:47 +0000)]
am
427d438d: am
da2c0a70: Merge changes Ib87855e8,I4b46ae20,I66364a5c,Id3fcf680
* commit '
427d438dd44bb79dad87d51ad60593872391e7a7':
Use LOCAL_LDFLAGS_64 instead of enumerating 64-bit architectures
Fix typo in cpu variant makefile depenendency for arm64
Remove libc_static_common_src_files
Share LP32 makefile settings between arches
Yabin Cui [Thu, 5 Feb 2015 18:47:06 +0000 (18:47 +0000)]
am
e760a1eb: am
17976019: Merge "Fix poll/ppoll fortify test to avoid hanging in failed fortify clang test."
* commit '
e760a1eb30804df478640b2176fc798ab6e7db9b':
Fix poll/ppoll fortify test to avoid hanging in failed fortify clang test.
Yabin Cui [Thu, 5 Feb 2015 04:53:56 +0000 (20:53 -0800)]
Add path separator in bionic-unit-tests program path.
Bug:
19220800
Change-Id: I4245b1270363544cd5f083fe7ea7d9b11b46cdc0
Yabin Cui [Thu, 5 Feb 2015 04:24:43 +0000 (04:24 +0000)]
am
63826658: Merge "Add signal handling in bionic gtest main."
* commit '
63826658f4bcfff4f3a87fe651f22cc9b35fe8b9':
Add signal handling in bionic gtest main.
Yabin Cui [Thu, 5 Feb 2015 04:21:03 +0000 (04:21 +0000)]
Merge "Add signal handling in bionic gtest main."
Yabin Cui [Tue, 3 Feb 2015 03:14:05 +0000 (19:14 -0800)]
Add signal handling in bionic gtest main.
The two bugs are very closely related and code amount is very small,
So I think they may be fixed in one change.
Bug:
19128558
Bug:
19129994
Change-Id: I44a35398e64dfca7e9676428cb8f4026e8f6e488
Dimitry Ivanov [Thu, 5 Feb 2015 02:30:48 +0000 (02:30 +0000)]
am
8e5f9bc8: Merge "linker: Use load_bias to adjust search address in elf_addr_lookup"
* commit '
8e5f9bc8a46872e3f0ac4799558fdfd5999f9c20':
linker: Use load_bias to adjust search address in elf_addr_lookup
Colin Cross [Thu, 5 Feb 2015 02:30:47 +0000 (02:30 +0000)]
am
da2c0a70: Merge changes Ib87855e8,I4b46ae20,I66364a5c,Id3fcf680
* commit '
da2c0a708ed6c0091f3f89fd8838292579dad800':
Use LOCAL_LDFLAGS_64 instead of enumerating 64-bit architectures
Fix typo in cpu variant makefile depenendency for arm64
Remove libc_static_common_src_files
Share LP32 makefile settings between arches
Yabin Cui [Thu, 5 Feb 2015 02:30:46 +0000 (02:30 +0000)]
am
17976019: Merge "Fix poll/ppoll fortify test to avoid hanging in failed fortify clang test."
* commit '
17976019a13a94ae428849bfe297f8e531f95013':
Fix poll/ppoll fortify test to avoid hanging in failed fortify clang test.
Dimitry Ivanov [Thu, 5 Feb 2015 02:23:34 +0000 (02:23 +0000)]
Merge "linker: Use load_bias to adjust search address in elf_addr_lookup"
Colin Cross [Thu, 5 Feb 2015 01:57:27 +0000 (01:57 +0000)]
Merge changes Ib87855e8,I4b46ae20,I66364a5c,Id3fcf680
* changes:
Use LOCAL_LDFLAGS_64 instead of enumerating 64-bit architectures
Fix typo in cpu variant makefile depenendency for arm64
Remove libc_static_common_src_files
Share LP32 makefile settings between arches
Colin Cross [Thu, 5 Feb 2015 01:40:29 +0000 (17:40 -0800)]
Use LOCAL_LDFLAGS_64 instead of enumerating 64-bit architectures
LOCAL_LDFLAGS_<arch> was being set for arm64, mips64, and x86_64.
Use LOCAL_LDFLAGS_64 instead.
Change-Id: Ib87855e8a7783f82461b707fffa7f1663e6be9c8
Colin Cross [Thu, 5 Feb 2015 01:38:27 +0000 (17:38 -0800)]
Fix typo in cpu variant makefile depenendency for arm64
cpu_variank_mk -> cpu_variant_mk
Change-Id: I4b46ae20de72ed2dc8820d62ac35ddc6b915a195
Colin Cross [Thu, 5 Feb 2015 01:37:23 +0000 (17:37 -0800)]
Remove libc_static_common_src_files
libc_static_common_src_files is never set after
c3f114037dbf028896310609fd28cf2b3da99c4d, remove the remaining
references to it.
Change-Id: I66364a5c1b031ad69d608f6f44244049192944f6
Colin Cross [Thu, 5 Feb 2015 01:35:49 +0000 (17:35 -0800)]
Share LP32 makefile settings between arches
Add <var>_32 to patch-up-arch-specific-flags, and move the LP32
cruft varaibles from the 32-bit arch specific makefiles into the
top level Android.mk.
Change-Id: Id3fcf6805d4af048c2524c94b1295416ebe7d057
Chris Dearman [Thu, 14 Nov 2013 01:22:33 +0000 (17:22 -0800)]
linker: Use load_bias to adjust search address in elf_addr_lookup
load_bias is the delta between a symbols address in memory and the value
contained in the symbol table.
Change-Id: I35c87b69025b64f7e4a1418ca766618f4533fb3e
Yabin Cui [Thu, 5 Feb 2015 01:14:32 +0000 (01:14 +0000)]
Merge "Fix poll/ppoll fortify test to avoid hanging in failed fortify clang test."
Yabin Cui [Wed, 4 Feb 2015 02:40:44 +0000 (18:40 -0800)]
Stop including <linux/param.h> in <sys/param.h>.
Bug:
19092844
Change-Id: I1a4a0c84a196a187ea32e58491de744cf3c0f404
Yabin Cui [Wed, 4 Feb 2015 01:52:32 +0000 (17:52 -0800)]
Fix poll/ppoll fortify test to avoid hanging in failed fortify clang test.
Bug:
19220800
Change-Id: Ie75c640183c4a41a499556fefb4f824a134a5fb1
Neil Fuller [Wed, 4 Feb 2015 16:45:04 +0000 (16:45 +0000)]
am
6d632af3: am
2151f09f: Merge "Set INCLUDE_UNI_CORE_DATA=1 when rebuilding ICU4C time zone data."
* commit '
6d632af3b04e505a88aa0b73f95a873dcbd472f7':
Set INCLUDE_UNI_CORE_DATA=1 when rebuilding ICU4C time zone data.
Neil Fuller [Wed, 4 Feb 2015 16:39:06 +0000 (16:39 +0000)]
am
2151f09f: Merge "Set INCLUDE_UNI_CORE_DATA=1 when rebuilding ICU4C time zone data."
* commit '
2151f09fbfc2f6084366587df10132e93f4d818c':
Set INCLUDE_UNI_CORE_DATA=1 when rebuilding ICU4C time zone data.
Neil Fuller [Wed, 4 Feb 2015 16:33:01 +0000 (16:33 +0000)]
Merge "Set INCLUDE_UNI_CORE_DATA=1 when rebuilding ICU4C time zone data."
Fredrik Roubert [Wed, 4 Feb 2015 16:17:34 +0000 (17:17 +0100)]
Set INCLUDE_UNI_CORE_DATA=1 when rebuilding ICU4C time zone data.
This is now necessary to build .dat files that are useable for ICU4J as
well, and will need to be used for any future updates of the .dat file:
https://android.googlesource.com/platform/external/icu/+/
6b52738
Change-Id: Ifa3a7469a66ab932db20876697e45814f0c5ddc3