resolved conflicts for merge of 4de4e6de to lmp-mr1-dev-plus-aosp

Change-Id: Ie5c1c814ccd819a592d834879173edb8af15a52d
2014-10-29 17:32:31 +00:00 · 2014-10-29 17:32:31 +00:00 · 83c29aea2f
commit 83c29aea2f
parent 7d5484b0fc 4de4e6defc
1 changed files with 3 additions and 0 deletions
--- a/libnativebridge/tests/CompleteFlow_test.cpp
+++ b/libnativebridge/tests/CompleteFlow_test.cpp
@ -36,11 +36,14 @@ TEST_F(NativeBridgeTest, CompleteFlow) {

    // Unload
    UnloadNativeBridge();
+
    ASSERT_FALSE(NativeBridgeAvailable());
    ASSERT_FALSE(NativeBridgeError());

    // Clean-up code_cache
    ASSERT_EQ(0, rmdir(kCodeCache));
+
+    ASSERT_FALSE(NativeBridgeError());
 }

 }  // namespace android