commit 5e5df0f349441e6357f50327c939ef3e0650caf1
author Victor Khimenko <khim@google.com> Wed Mar 01 11:59:52 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Mar 01 11:59:52 2017 +0000
tree 5a54eb1cb5299a0ee5b0abdd46a7289f2e4e263c
parent 6b9fea9249fe2797e797612bf52a44a5fea2bac8
parent 369e25dccbaea876d1492c8c9bce49367b2823b9

Merge "Stop using __system_property_area__" am: 90c12683ee am: 0ce0b54a0e
am: 369e25dccb

Change-Id: I1921850653794829a1e0df168afe71cebdc5a795

tests/JniInvocation_test.cpp

diff --git a/tests/JniInvocation_test.cpp b/tests/JniInvocation_test.cpp
index 186b74e..7a73c70 100644
--- a/tests/JniInvocation_test.cpp
+++ b/tests/JniInvocation_test.cpp
@@ -37,8 +37,6 @@
 #define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_
 #include <sys/_system_properties.h>
 
-extern void *__system_property_area__;
-
 struct LocalPropertyTestState {
     LocalPropertyTestState() : valid(false) {
         const char* ANDROID_DATA = getenv("ANDROID_DATA");
@@ -51,9 +49,6 @@
             return;
         }
 
-        old_pa = __system_property_area__;
-        __system_property_area__ = NULL;
-
         pa_dirname = dirname;
         pa_filename = pa_dirname + "/__properties__";
 
@@ -67,9 +62,8 @@
             return;
         }
 
-        __system_property_area__ = old_pa;
-
         __system_property_set_filename(PROP_FILENAME);
+        __system_properties_init();
         unlink(pa_filename.c_str());
         rmdir(pa_dirname.c_str());
     }
@@ -78,7 +72,6 @@
 private:
     std::string pa_dirname;
     std::string pa_filename;
-    void *old_pa;
 };
 #endif