summaryrefslogtreecommitdiffstats
path: root/libnativebridge
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2014-09-29 14:59:50 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-09-29 14:59:50 +0000
commit68c19686e8f9b5a88e3b2729a453d03516be79f1 (patch)
tree41a5154633e3da54ebe2196afc1c28bc88e622a7 /libnativebridge
parentaa68f3e9dd673fee8a96c80b9f4bb816cd42e680 (diff)
parentc00994df055f09926510d228da5a30510b50a9b6 (diff)
downloadsystem_core-68c19686e8f9b5a88e3b2729a453d03516be79f1.zip
system_core-68c19686e8f9b5a88e3b2729a453d03516be79f1.tar.gz
system_core-68c19686e8f9b5a88e3b2729a453d03516be79f1.tar.bz2
Merge "Fix mac build for nativebridge tests."
Diffstat (limited to 'libnativebridge')
-rw-r--r--libnativebridge/tests/PreInitializeNativeBridge_test.cpp4
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.