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

* commit '0c3436e069254b11af13c4da87a72cdc343e4c7f':
  Fix mac build for nativebridge tests.
This commit is contained in:
Andreas Gampe 2014-09-29 22:26:43 +00:00 committed by Android Git Automerger
commit 3432fe1c37

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.