Merge "linker namespace name is duped when the namespace is created" am: c2e2ebda5a
am: 8e8bf9abb9
Change-Id: If5858d654c40cade007a9a0bf9d8ab2a208eefcb
diff --git a/linker/linker_namespaces.h b/linker/linker_namespaces.h
index f4428eb..215ad05 100644
--- a/linker/linker_namespaces.h
+++ b/linker/linker_namespaces.h
@@ -72,9 +72,9 @@
struct android_namespace_t {
public:
- android_namespace_t() : name_(nullptr), is_isolated_(false), is_greylist_enabled_(false) {}
+ android_namespace_t() : is_isolated_(false), is_greylist_enabled_(false) {}
- const char* get_name() const { return name_; }
+ const char* get_name() const { return name_.c_str(); }
void set_name(const char* name) { name_ = name; }
bool is_isolated() const { return is_isolated_; }
@@ -161,7 +161,7 @@
soinfo_list_t get_shared_group();
private:
- const char* name_;
+ std::string name_;
bool is_isolated_;
bool is_greylist_enabled_;
std::vector<std::string> ld_library_paths_;