pa-fazil
/
android_bionic
mirror of https://github.com/fazilsheik96/android_bionic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Stop using __system_property_area__ 

Apparently that "backdoor" is no longer needed - the proper way is
to reinitialize properties:
    https://android-review.googlesource.com/#/c/181794/24/tests/system_properties_test.cpp

Also removes mentions of libnativehelper test (it no longer uses
__system_property_area__) and removes useless "extern" declaration
(actual use was removed long ago).

Test: refactoring CL, existsing tests still pass

BUG=21852512
BUG=34114501

Change-Id: I2223cab2fcb671ea180ad4470a7aba5c9cd20bd8
This commit is contained in:
Victor Khimenko 2017-03-01 20:36:13 +01:00
parent ebceea8e85
commit 4a92ffd302
3 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
benchmarks/property_benchmark.cpp
View File

@ -28,8 +28,6 @@
#include <benchmark/benchmark.h> #include <benchmark/benchmark.h>
extern void* __system_property_area__;
// Do not exceed 512, that is about the largest number of properties // Do not exceed 512, that is about the largest number of properties
// that can be created with the current property area size. // that can be created with the current property area size.
#define TEST_NUM_PROPS \ #define TEST_NUM_PROPS \
@ -53,9 +51,6 @@ struct LocalPropertyTestState {
return; return;
} }
old_pa = __system_property_area__;
__system_property_area__ = NULL;
pa_dirname = dirname; pa_dirname = dirname;
pa_filename = pa_dirname + "/__properties__"; pa_filename = pa_dirname + "/__properties__";
@ -111,9 +106,8 @@ struct LocalPropertyTestState {
if (!valid) if (!valid)
return; return;
__system_property_area__ = old_pa;
__system_property_set_filename(PROP_FILENAME); __system_property_set_filename(PROP_FILENAME);
__system_property_area_init();
unlink(pa_filename.c_str()); unlink(pa_filename.c_str());
rmdir(pa_dirname.c_str()); rmdir(pa_dirname.c_str());
@ -138,7 +132,6 @@ struct LocalPropertyTestState {
private: private:
std::string pa_dirname; std::string pa_dirname;
std::string pa_filename; std::string pa_filename;
void* old_pa;
}; };
static void BM_property_get(benchmark::State& state) { static void BM_property_get(benchmark::State& state) {

1
libc/bionic/system_properties.cpp
View File

@ -209,7 +209,6 @@ struct find_nth_cookie {
}; };
// This is public because it was exposed in the NDK. As of 2017-01, ~60 apps reference this symbol. // This is public because it was exposed in the NDK. As of 2017-01, ~60 apps reference this symbol.
// It's also used in a libnativehelper test.
prop_area* __system_property_area__ = nullptr; prop_area* __system_property_area__ = nullptr;
static char property_filename[PROP_FILENAME_MAX] = PROP_FILENAME; static char property_filename[PROP_FILENAME_MAX] = PROP_FILENAME;

2
tests/system_properties_test.cpp
View File

@ -29,8 +29,6 @@
#define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_ #define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_
#include <sys/_system_properties.h> #include <sys/_system_properties.h>
extern void *__system_property_area__;
struct LocalPropertyTestState { struct LocalPropertyTestState {
LocalPropertyTestState() : valid(false) { LocalPropertyTestState() : valid(false) {
const char* ANDROID_DATA = getenv("ANDROID_DATA"); const char* ANDROID_DATA = getenv("ANDROID_DATA");