am 68c19686: Merge "Fix mac build for nativebridge tests."

* commit '68c19686e8f9b5a88e3b2729a453d03516be79f1':
  Fix mac build for nativebridge tests.
This commit is contained in:
Andreas Gampe 2014-09-29 20:48:04 +00:00 committed by Android Git Automerger
commit f0699c11de

View file

@ -31,8 +31,8 @@ namespace android {
static constexpr const char* kTestData = "PreInitializeNativeBridge test.";
TEST_F(NativeBridgeTest, PreInitializeNativeBridge) {
#ifndef __APPLE_ // Mac OS does not support bind-mount.
#ifndef HAVE_ANDROID_OS // Cannot write into the hard-wired location.
#ifndef __APPLE__ // Mac OS does not support bind-mount.
#ifndef HAVE_ANDROID_OS // Cannot write into the hard-wired location.
// Try to create our mount namespace.
if (unshare(CLONE_NEWNS) != -1) {
// Create a dummy file.