diff options
| author | Victor Khimenko <khim@google.com> | 2017-03-01 11:59:52 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-01 11:59:52 +0000 |
| commit | 5e5df0f349441e6357f50327c939ef3e0650caf1 (patch) | |
| tree | 5a54eb1cb5299a0ee5b0abdd46a7289f2e4e263c | |
| parent | 6b9fea9249fe2797e797612bf52a44a5fea2bac8 (diff) | |
| parent | 369e25dccbaea876d1492c8c9bce49367b2823b9 (diff) | |
| download | platform_libnativehelper-security-oc-release.tar.gz platform_libnativehelper-security-oc-release.tar.bz2 platform_libnativehelper-security-oc-release.zip | |
Merge "Stop using __system_property_area__" am: 90c12683ee am: 0ce0b54a0eandroid-vts-8.0_r9android-vts-8.0_r8android-vts-8.0_r7android-vts-8.0_r6android-vts-8.0_r2android-vts-8.0_r13android-vts-8.0_r12android-vts-8.0_r11android-vts-8.0_r10android-vts-8.0_r1android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releaseoreo-vts-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-devoreo-cts-release
am: 369e25dccb
Change-Id: I1921850653794829a1e0df168afe71cebdc5a795
| -rw-r--r-- | tests/JniInvocation_test.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
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 @@ struct LocalPropertyTestState { return; } - old_pa = __system_property_area__; - __system_property_area__ = NULL; - pa_dirname = dirname; pa_filename = pa_dirname + "/__properties__"; @@ -67,9 +62,8 @@ struct LocalPropertyTestState { 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 @@ public: private: std::string pa_dirname; std::string pa_filename; - void *old_pa; }; #endif |