diff options
Diffstat (limited to 'linker/linker_namespaces.h')
| -rw-r--r-- | linker/linker_namespaces.h | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/linker/linker_namespaces.h b/linker/linker_namespaces.h index 6843ebc89..77b662294 100644 --- a/linker/linker_namespaces.h +++ b/linker/linker_namespaces.h @@ -76,7 +76,7 @@ struct android_namespace_t { public: android_namespace_t() : is_isolated_(false), - is_greylist_enabled_(false), + is_exempt_list_enabled_(false), is_also_used_as_anonymous_(false) {} const char* get_name() const { return name_.c_str(); } @@ -85,8 +85,8 @@ struct android_namespace_t { bool is_isolated() const { return is_isolated_; } void set_isolated(bool isolated) { is_isolated_ = isolated; } - bool is_greylist_enabled() const { return is_greylist_enabled_; } - void set_greylist_enabled(bool enabled) { is_greylist_enabled_ = enabled; } + bool is_exempt_list_enabled() const { return is_exempt_list_enabled_; } + void set_exempt_list_enabled(bool enabled) { is_exempt_list_enabled_ = enabled; } bool is_also_used_as_anonymous() const { return is_also_used_as_anonymous_; } void set_also_used_as_anonymous(bool yes) { is_also_used_as_anonymous_ = yes; } @@ -118,14 +118,12 @@ struct android_namespace_t { permitted_paths_ = permitted_paths; } - const std::vector<std::string>& get_whitelisted_libs() const { - return whitelisted_libs_; + const std::vector<std::string>& get_allowed_libs() const { return allowed_libs_; } + void set_allowed_libs(std::vector<std::string>&& allowed_libs) { + allowed_libs_ = std::move(allowed_libs); } - void set_whitelisted_libs(std::vector<std::string>&& whitelisted_libs) { - whitelisted_libs_ = std::move(whitelisted_libs); - } - void set_whitelisted_libs(const std::vector<std::string>& whitelisted_libs) { - whitelisted_libs_ = whitelisted_libs; + void set_allowed_libs(const std::vector<std::string>& allowed_libs) { + allowed_libs_ = allowed_libs; } const std::vector<android_namespace_link_t>& linked_namespaces() const { @@ -171,12 +169,12 @@ struct android_namespace_t { private: std::string name_; bool is_isolated_; - bool is_greylist_enabled_; + bool is_exempt_list_enabled_; bool is_also_used_as_anonymous_; std::vector<std::string> ld_library_paths_; std::vector<std::string> default_library_paths_; std::vector<std::string> permitted_paths_; - std::vector<std::string> whitelisted_libs_; + std::vector<std::string> allowed_libs_; // Loader looks into linked namespace if it was not able // to find a library in this namespace. Note that library // lookup in linked namespaces are limited by the list of |