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

* commit 'f0699c11debade875e87efad27d37ddf6fa83ed6':
  Fix mac build for nativebridge tests.
This commit is contained in:
Andreas Gampe 2014-09-29 22:01:58 +00:00 committed by Android Git Automerger
commit 3bfa57e1e3
1 changed files with 2 additions and 2 deletions

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.