diff options
| author | Andreas Gampe <agampe@google.com> | 2014-09-29 22:01:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-29 22:01:58 +0000 |
| commit | 3bfa57e1e38a9eb35d5eba9eb62547d0a1f179a5 (patch) | |
| tree | a26fc239678132ea4a04332d6506d7631030ff90 | |
| parent | c61301cc67ccc2e5628ededbf788aa6839c26aca (diff) | |
| parent | f0699c11debade875e87efad27d37ddf6fa83ed6 (diff) | |
| download | system_core-3bfa57e1e38a9eb35d5eba9eb62547d0a1f179a5.zip system_core-3bfa57e1e38a9eb35d5eba9eb62547d0a1f179a5.tar.gz system_core-3bfa57e1e38a9eb35d5eba9eb62547d0a1f179a5.tar.bz2 | |
am f0699c11: am 68c19686: Merge "Fix mac build for nativebridge tests."
* commit 'f0699c11debade875e87efad27d37ddf6fa83ed6':
Fix mac build for nativebridge tests.
| -rw-r--r-- | libnativebridge/tests/PreInitializeNativeBridge_test.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libnativebridge/tests/PreInitializeNativeBridge_test.cpp b/libnativebridge/tests/PreInitializeNativeBridge_test.cpp index 9b487d7..84078f7 100644 --- a/libnativebridge/tests/PreInitializeNativeBridge_test.cpp +++ b/libnativebridge/tests/PreInitializeNativeBridge_test.cpp @@ -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. |