am 479ce0c1: Merge "Fix mac build for nativebridge tests." into lmp-dev

* commit '479ce0c1f3d9ecbaf7947651a5e00828ec522f15':
  Fix mac build for nativebridge tests.
This commit is contained in:
Brian Carlstrom 2014-10-01 00:52:55 +00:00 committed by Android Git Automerger
commit 5a0f0e9710

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.