Support static/dynamic for bionic

native_client_sdk/src/tests/nacl_io_test/kernel_wrap_test.cc

Index: native_client_sdk/src/tests/nacl_io_test/kernel_wrap_test.cc
diff --git a/native_client_sdk/src/tests/nacl_io_test/kernel_wrap_test.cc b/native_client_sdk/src/tests/nacl_io_test/kernel_wrap_test.cc
index c043445af65f11991c629cb957b56d1dd5322364..bbfa60047a31cc9bbb6afc3d3891f9b91308bd00 100644
--- a/native_client_sdk/src/tests/nacl_io_test/kernel_wrap_test.cc
+++ b/native_client_sdk/src/tests/nacl_io_test/kernel_wrap_test.cc
@@ -530,16 +530,17 @@ TEST_F(KernelWrapTest, truncate) {
   EXPECT_EQ(0, truncate(kDummyConstChar, kDummyInt3));
 }
 
-#ifndef __BIONIC__
 TEST_F(KernelWrapTest, lstat) {
-  struct stat buf;
-  EXPECT_CALL(mock, lstat(kDummyConstChar, &buf)).WillOnce(Return(-1));
-  EXPECT_EQ(-1, lstat(kDummyConstChar, &buf));
-
-  EXPECT_CALL(mock, lstat(kDummyConstChar, &buf)).WillOnce(Return(0));
-  EXPECT_EQ(0, lstat(kDummyConstChar, &buf));
+  struct stat in_statbuf;
+  MakeDummyStatbuf(&in_statbuf);
+  EXPECT_CALL(mock, lstat(StrEq(kDummyConstChar), _))
+      .WillOnce(DoAll(SetStat(&in_statbuf), Return(0)))
+      .WillOnce(Return(-1));
+  struct stat out_statbuf;
+  EXPECT_EQ(0, lstat(kDummyConstChar, &out_statbuf));
+  EXPECT_THAT(&in_statbuf, IsEqualToStatbuf(&out_statbuf));
+  EXPECT_EQ(-1, lstat(kDummyConstChar, &out_statbuf));
 }
-#endif
 
 TEST_F(KernelWrapTest, unlink) {
   EXPECT_CALL(mock, unlink(kDummyConstChar)).WillOnce(Return(kDummyInt));