OSDN Git Service
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 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:31:05 +0000 (00:31 +0000)]
Merge "Cleanup the libm makefile."
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:46:45 +0000 (19:46 +0000)]
Merge "Stop including <linux/param.h> in <sys/param.h>."
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: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:25:29 +0000 (23:25 +0000)]
Merge "Switch kernel header parsing to python libclang"
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 21:55:18 +0000 (21:55 +0000)]
Merge "Add path separator in bionic-unit-tests program path."
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 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: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: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: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
Yabin Cui [Wed, 4 Feb 2015 02:42:15 +0000 (02:42 +0000)]
Merge "Switch sem_t from bionic atomics to stdatomic.h."
Yabin Cui [Fri, 30 Jan 2015 20:30:08 +0000 (12:30 -0800)]
Switch sem_t from bionic atomics to stdatomic.h.
Bug:
17572887
Change-Id: If66851ba9b831cdd698b9f1303289bb14448bd03
Yabin Cui [Tue, 3 Feb 2015 22:28:55 +0000 (22:28 +0000)]
Merge "Add test about pthread_mutex_t owner tid limit."
Yabin Cui [Tue, 3 Feb 2015 18:32:00 +0000 (10:32 -0800)]
Add test about pthread_mutex_t owner tid limit.
Bug:
19216648
Change-Id: I7b12955bdcad31c13bf8ec2740ff88ba15223ec0
Nick Kralevich [Tue, 3 Feb 2015 20:17:32 +0000 (20:17 +0000)]
Merge "Ensure raw fchmod/fchmodat syscalls are hidden."
Nick Kralevich [Tue, 3 Feb 2015 19:27:25 +0000 (11:27 -0800)]
Ensure raw fchmod/fchmodat syscalls are hidden.
In https://android-review.googlesource.com/#/c/127908/5/libc/SYSCALLS.TXT@116
Elliott said:
for LP64 these will be hidden. for LP32 we were cowards and left
them all public for compatibility (though i don't think we ever
dremeled to see whether it was needed). we don't have an easy
way to recognize additions, though, so we can't prevent adding
new turds.
Add a mechanism to prevent the adding of new turds, and use that
mechanism on the fchmod/fchmodat system calls.
Bug:
19233951
Change-Id: I98f98345970b631a379f348df57858f9fc3d57c0
Hans Boehm [Tue, 3 Feb 2015 02:42:53 +0000 (02:42 +0000)]
Merge "Switch pthread_mutex_t from bionic atomics to <stdatomic.h>."
Elliott Hughes [Tue, 3 Feb 2015 01:21:16 +0000 (01:21 +0000)]
Merge "Clean up SEEK_SET definitions."
Yabin Cui [Fri, 30 Jan 2015 05:50:48 +0000 (21:50 -0800)]
Switch pthread_mutex_t from bionic atomics to <stdatomic.h>.
Bug:
17574456
Change-Id: I5ce3d3dc07e804e9ce55c42920f47531b56e04de
Nick Kralevich [Mon, 2 Feb 2015 22:03:41 +0000 (22:03 +0000)]
Merge "Add fchmodat(AT_SYMLINK_NOFOLLOW) and fchmod O_PATH support"
Elliott Hughes [Mon, 2 Feb 2015 22:02:09 +0000 (14:02 -0800)]
Clean up SEEK_SET definitions.
If we lose the #ifndef, the compiler will tell us if the definitions
of SEEK_SET and friends ever get out of sync.
Change-Id: I357cabec7c9cd451c604342344f210bba20fb6bc
Nick Kralevich [Sun, 1 Feb 2015 03:57:46 +0000 (19:57 -0800)]
Add fchmodat(AT_SYMLINK_NOFOLLOW) and fchmod O_PATH support
Many libc functions have an option to not follow symbolic
links. This is useful to avoid security sensitive code
from inadvertantly following attacker supplied symlinks
and taking inappropriate action on files it shouldn't.
For example, open() has O_NOFOLLOW, chown() has
lchown(), stat() has lstat(), etc.
There is no such equivalent function for chmod(), such as lchmod().
To address this, POSIX introduced fchmodat(AT_SYMLINK_NOFOLLOW),
which is intended to provide a way to perform a chmod operation
which doesn't follow symlinks.
Currently, the Linux kernel doesn't implement AT_SYMLINK_NOFOLLOW.
In GLIBC, attempting to use the AT_SYMLINK_NOFOLLOW flag causes
fchmodat to return ENOTSUP. Details are in "man fchmodat".
Bionic currently differs from GLIBC in that AT_SYMLINK_NOFOLLOW
is silently ignored and treated as if the flag wasn't present.
This patch provides a userspace implementation of
AT_SYMLINK_NOFOLLOW for bionic. Using open(O_PATH | O_NOFOLLOW),
we can provide a way to atomically change the permissions on
files without worrying about race conditions.
As part of this change, we add support for fchmod on O_PATH
file descriptors, because it's relatively straight forward
and could be useful in the future.
The basic idea behind this implementation comes from
https://sourceware.org/bugzilla/show_bug.cgi?id=14578 , specifically
comment #10.
Change-Id: I1eba0cdb2c509d9193ceecf28f13118188a3cfa7
Elliott Hughes [Mon, 2 Feb 2015 20:36:29 +0000 (20:36 +0000)]
Merge "Small logging cleanup."
Elliott Hughes [Mon, 2 Feb 2015 20:24:46 +0000 (12:24 -0800)]
Small logging cleanup.
Don't send the trailing NUL bytes to the logger, call strlen if we already
know the length, or cast more specifically than we need to.
Change-Id: I68c9388a22bddea49120a1022dda8db8991360c1
Elliott Hughes [Mon, 2 Feb 2015 19:25:57 +0000 (19:25 +0000)]
Merge "Explicitly check that the reason fortify tests abort is fortify."
Elliott Hughes [Mon, 2 Feb 2015 19:18:58 +0000 (11:18 -0800)]
Explicitly check that the reason fortify tests abort is fortify.
Change-Id: I95291e2febf7b497c1d9f37fd7fa9acdd21e86a4
Elliott Hughes [Mon, 2 Feb 2015 18:23:28 +0000 (18:23 +0000)]
Merge "Fix clang build."
Elliott Hughes [Mon, 2 Feb 2015 18:21:39 +0000 (10:21 -0800)]
Fix clang build.
Change-Id: I863137b5d35602267b4ef3a74399cf394c9994d6
Neil Fuller [Mon, 2 Feb 2015 17:52:47 +0000 (17:52 +0000)]
Merge "Fixes to the update-tzdata.py tool"
Elliott Hughes [Mon, 2 Feb 2015 17:51:50 +0000 (17:51 +0000)]
Merge "Fortify poll and ppoll."
Neil Fuller [Mon, 2 Feb 2015 16:50:05 +0000 (16:50 +0000)]
Fixes to the update-tzdata.py tool
We build one too many times. Creating a missing directory
is sufficient.
The tz2icu needs some files in the CWD. Added symlinks.
Bug:
19230091
Change-Id: I58f9817af68b229f48139e56503f50a2b6dbb4fe
Elliott Hughes [Mon, 2 Feb 2015 17:15:19 +0000 (09:15 -0800)]
Fortify poll and ppoll.
And remove the test for FD_ZERO fortification, which never made much
sense anyway.
Change-Id: Id1009c5298d461fa4722189e8ecaf22f0c529536
Elliott Hughes [Mon, 2 Feb 2015 05:56:26 +0000 (05:56 +0000)]
Merge "Add the fortify tests back into the glibc tests."
Elliott Hughes [Sun, 1 Feb 2015 05:32:10 +0000 (21:32 -0800)]
Add the fortify tests back into the glibc tests.
Change-Id: I4426d0c7c1bfe3b0028a674f72d1c3b9d883d6af
Elliott Hughes [Sat, 31 Jan 2015 04:37:10 +0000 (04:37 +0000)]
Merge "Include <malloc.h> for struct mallinfo."
Elliott Hughes [Sat, 31 Jan 2015 04:33:31 +0000 (20:33 -0800)]
Include <malloc.h> for struct mallinfo.
GCC doesn't seem to care, but clang does.
Change-Id: I9884820339a9e6f142862928c357f1a538184ae0
Elliott Hughes [Sat, 31 Jan 2015 04:18:09 +0000 (04:18 +0000)]
Merge "Break two incorrect transitive includes."
Dan Albert [Fri, 30 Jan 2015 17:18:48 +0000 (17:18 +0000)]
Merge "Put back inline definitions if using an old API."
Elliott Hughes [Fri, 30 Jan 2015 06:21:54 +0000 (06:21 +0000)]
Merge "Remove unused CONFIG_SECONDS."
Elliott Hughes [Fri, 30 Jan 2015 05:47:37 +0000 (21:47 -0800)]
Remove unused CONFIG_SECONDS.
Bug: https://code.google.com/p/android/issues/detail?id=65951
Change-Id: I8ae7057c68e16618de6dd06cf052426c6cad8a3d
Elliott Hughes [Thu, 29 Jan 2015 05:02:34 +0000 (21:02 -0800)]
Break two incorrect transitive includes.
Change-Id: I95519caa5258cf5c6b8053f1c7e08ade2a824e49
Dan Albert [Thu, 29 Jan 2015 02:16:08 +0000 (18:16 -0800)]
Put back inline definitions if using an old API.
All these inlines were turned in to out of line definitions in L.
This brings us a step closer to being able to just use the current
bionic headers for the NDK, rather than having many old versions of
them.
Change-Id: Ie010bc727d78d3742abc577c70f6578db2e68625
Dan Albert [Thu, 29 Jan 2015 21:54:54 +0000 (21:54 +0000)]
Merge "Add primitive CPPLINT.cfg."
Yabin Cui [Thu, 29 Jan 2015 20:22:24 +0000 (20:22 +0000)]
Merge "Rewrite __cxa_guard.cpp with <stdatomic.h>."
Dan Albert [Thu, 29 Jan 2015 18:52:53 +0000 (10:52 -0800)]
Add primitive CPPLINT.cfg.
We'll add more things to this as we discover other warnings we don't
care about.
Change-Id: I408f688827cab0f74e055d8f1778069163663f0b
Yabin Cui [Thu, 29 Jan 2015 18:47:45 +0000 (10:47 -0800)]
Rewrite __cxa_guard.cpp with <stdatomic.h>.
Bug:
19180923
Change-Id: If4912d01db43c72ef12f4b04270ddb5d76d09462
Elliott Hughes [Thu, 29 Jan 2015 03:23:35 +0000 (03:23 +0000)]
Merge "Add missing includes."
Elliott Hughes [Thu, 29 Jan 2015 02:02:33 +0000 (18:02 -0800)]
Add missing includes.
Change-Id: Ibf549266a19a67eb9158d341a69dddfb654be669
Yabin Cui [Thu, 29 Jan 2015 02:30:24 +0000 (02:30 +0000)]
Merge "Add --gtest-filter as synonym for --gtest_filter in bionic gtest main."
Christopher Ferris [Thu, 29 Jan 2015 01:49:20 +0000 (01:49 +0000)]
Merge "Only one crashing thread should contact debuggerd."
Elliott Hughes [Thu, 29 Jan 2015 01:31:58 +0000 (01:31 +0000)]
Merge "Modify MIPS64 stat structure to match a generic one in AOSP."
Christopher Ferris [Thu, 29 Jan 2015 00:13:56 +0000 (16:13 -0800)]
Only one crashing thread should contact debuggerd.
If two or more threads crash at the same time, only let one talk to
debuggerd. It's possible for a race to occur that two threads send
data to debuggerd, the second one will cause errors in debuggerd since
the process will die once debuggerd lets the crashing pid start again.
Bug:
19183955
Change-Id: I17dfce46102117ab4a870f7381bd526488d37fb5
Raghu Gandham [Thu, 15 Jan 2015 19:12:22 +0000 (11:12 -0800)]
Modify MIPS64 stat structure to match a generic one in AOSP.
The kernel version of the stat structure is used during the syscalls. After the syscall,
the kernel stat structure is converted to match the generic one. Eventually we would like
the generic stat structure and related syscalls be added to MIPS64 kernel, removing the
thunks added to AOSP.
Change-Id: I7764e80278c1cc8254754c3531ec2dda7544a8ec
Yabin Cui [Wed, 28 Jan 2015 22:28:14 +0000 (14:28 -0800)]
Add --gtest-filter as synonym for --gtest_filter in bionic gtest main.
Bug:
19130480
Change-Id: I0d3df70ee8f692581cc4b9b742c5f347259fd0d2
Yabin Cui [Wed, 28 Jan 2015 21:16:04 +0000 (21:16 +0000)]
Merge "Switch pthread_once_t to stdatomic.h."
Dimitry Ivanov [Wed, 28 Jan 2015 17:34:51 +0000 (17:34 +0000)]
Merge "Fix mips64 build. Replace explicit cast with static_cast"
Nikola Veljkovic [Wed, 28 Jan 2015 15:18:52 +0000 (16:18 +0100)]
Fix mips64 build. Replace explicit cast with static_cast
Change-Id: Ib08fbe8bb832884a3eb33904fe4d490759116cb2
Yabin Cui [Sat, 24 Jan 2015 02:21:46 +0000 (18:21 -0800)]
Switch pthread_once_t to stdatomic.h.
Bug:
17574610
Change-Id: I653f2aa4b5b38dbdaffe4a6c3deccfe6ad3b0e74
Yabin Cui [Tue, 27 Jan 2015 22:00:35 +0000 (22:00 +0000)]
Merge "Fix parse of gtest_filter in bionic gtest main."
Elliott Hughes [Tue, 27 Jan 2015 19:39:37 +0000 (19:39 +0000)]
Merge "Fix mips build."
Yabin Cui [Tue, 27 Jan 2015 19:22:46 +0000 (11:22 -0800)]
Fix parse of gtest_filter in bionic gtest main.
Bug:
19130330
Change-Id: Id6a60570a8aab6ae7259ff228b3801285b378f77
Elliott Hughes [Tue, 27 Jan 2015 19:09:27 +0000 (11:09 -0800)]
Fix mips build.
Move various mips-only things into the arch-mips directory. As soon as mips
writes assembler replacements, we can remove these.
Change-Id: Ia7308559bc361f5c8df3e1d456b381865e060b93
Elliott Hughes [Tue, 27 Jan 2015 19:08:33 +0000 (19:08 +0000)]
Merge "Add a test for float registers across setjmp/logjmp."
Elliott Hughes [Tue, 27 Jan 2015 05:46:55 +0000 (05:46 +0000)]
Merge "x86 has an assembler bcopy implementation."
Elliott Hughes [Tue, 27 Jan 2015 05:45:56 +0000 (21:45 -0800)]
x86 has an assembler bcopy implementation.
Change-Id: I4ed7af3c5b104f86550120401f773150c460f37b
Yabin Cui [Tue, 27 Jan 2015 05:32:52 +0000 (05:32 +0000)]
Merge "Rename "TIMEWARN" to "SLOW" in bionic gtest."
Yabin Cui [Tue, 27 Jan 2015 01:19:37 +0000 (17:19 -0800)]
Rename "TIMEWARN" to "SLOW" in bionic gtest.
Bug:
19109188.
Change-Id: Idfe769ac652bf37642da24e4abb6061ca861d57e
Elliott Hughes [Tue, 27 Jan 2015 04:56:19 +0000 (04:56 +0000)]
Merge "[Arm64] Fix overlapping fp fields in jmp_buf"
Elliott Hughes [Tue, 27 Jan 2015 04:52:34 +0000 (20:52 -0800)]
Add a test for float registers across setjmp/logjmp.
Change-Id: I17cc056b185755e0b91de096b5ceefee4f4e0b3a
Elliott Hughes [Tue, 27 Jan 2015 04:49:06 +0000 (04:49 +0000)]
Merge "Clean up <stdlib.h> slightly."
Lorenzo Colitti [Tue, 27 Jan 2015 04:02:42 +0000 (04:02 +0000)]
Merge "Make bionic compile even if resolver debugging is enabled."
Christopher Ferris [Tue, 27 Jan 2015 01:32:06 +0000 (01:32 +0000)]
Merge "Do not build host benchmark code on macs."
Yabin Cui [Tue, 27 Jan 2015 01:01:05 +0000 (01:01 +0000)]
Merge "Support --gtest_ouput option in bionic gtest main."