Merge "Don't fail if default namespace isn't found" am: 873d867e3a am: 5199628d06 am: a3f3c083f8 (e1e4ac74) · Commits · e / os / android_system_core

libnativeloader/native_loader_namespace.cpp

+11 −3

Original line number	Original line	Diff line number	Diff line
	@@ -69,10 +69,18 @@ Result<NativeLoaderNamespace> NativeLoaderNamespace::GetExportedNamespace(const
	// "default" always exists.		// "default" always exists.
	Result<NativeLoaderNamespace> NativeLoaderNamespace::GetPlatformNamespace(bool is_bridged) {		Result<NativeLoaderNamespace> NativeLoaderNamespace::GetPlatformNamespace(bool is_bridged) {
	auto ns = GetExportedNamespace(kPlatformNamespaceName, is_bridged);		auto ns = GetExportedNamespace(kPlatformNamespaceName, is_bridged);
	if (!ns) {		if (ns) return ns;
	ns = GetExportedNamespace(kDefaultNamespaceName, is_bridged);		ns = GetExportedNamespace(kDefaultNamespaceName, is_bridged);
			if (ns) return ns;

			// If nothing is found, return NativeLoaderNamespace constructed from nullptr.
			// nullptr also means default namespace to the linker.
			if (!is_bridged) {
			return NativeLoaderNamespace(kDefaultNamespaceName, static_cast<android_namespace_t*>(nullptr));
			} else {
			return NativeLoaderNamespace(kDefaultNamespaceName,
			static_cast<native_bridge_namespace_t*>(nullptr));
	}		}
	return ns;
	}		}

	Result<NativeLoaderNamespace> NativeLoaderNamespace::Create(		Result<NativeLoaderNamespace> NativeLoaderNamespace::Create(