Merge "move classes out of native_loader.cpp" (3c0d7e8d) · Commits · e / os / android_system_core

libnativeloader/Android.bp

+6 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,9 @@ cc_library {
		name: "libnativeloader",
		defaults: ["libnativeloader-defaults"],
		host_supported: true,
		srcs: ["native_loader.cpp"],
		srcs: [
		"native_loader.cpp",
		],
		shared_libs: [
		"libnativehelper",
		"liblog",
		@@ -26,6 +28,9 @@ cc_library {
		],
		target: {
		android: {
		srcs: [
		"library_namespaces.cpp",
		],
		shared_libs: [
		"libdl_android",
		],

libnativeloader/library_namespaces.cpp

0 → 100644

+660 −0

File added.

Preview size limit exceeded, changes collapsed.

libnativeloader/library_namespaces.h

0 → 100644

+64 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		#pragma once
		#if !defined(__ANDROID__)
		#error "Not available for host"
		#endif

		#include "native_loader_namespace.h"

		#include <list>
		#include <string>

		#include "jni.h"

		namespace android {

		// LibraryNamespaces is a singleton object that manages NativeLoaderNamespace
		// objects for an app process. Its main job is to create (and configure) a new
		// NativeLoaderNamespace object for a Java ClassLoader, and to find an existing
		// object for a given ClassLoader.
		class LibraryNamespaces {
		public:
		LibraryNamespaces() : initialized_(false) {}

		LibraryNamespaces(LibraryNamespaces&&) = default;
		LibraryNamespaces(const LibraryNamespaces&) = delete;
		LibraryNamespaces& operator=(const LibraryNamespaces&) = delete;

		void Initialize();
		void Reset() { namespaces_.clear(); }
		NativeLoaderNamespace* Create(JNIEnv* env, uint32_t target_sdk_version, jobject class_loader,
		bool is_shared, jstring dex_path, jstring java_library_path,
		jstring java_permitted_path, std::string* error_msg);
		NativeLoaderNamespace* FindNamespaceByClassLoader(JNIEnv* env, jobject class_loader);

		private:
		bool InitPublicNamespace(const char* library_path, std::string* error_msg);
		NativeLoaderNamespace* FindParentNamespaceByClassLoader(JNIEnv* env, jobject class_loader);

		bool initialized_;
		std::list<std::pair<jweak, NativeLoaderNamespace>> namespaces_;
		std::string system_public_libraries_;
		std::string runtime_public_libraries_;
		std::string vendor_public_libraries_;
		std::string oem_public_libraries_;
		std::string product_public_libraries_;
		std::string system_llndk_libraries_;
		std::string system_vndksp_libraries_;
		};

		} // namespace android

libnativeloader/native_loader.cpp

+37 −743

File changed.

Preview size limit exceeded, changes collapsed.

libnativeloader/native_loader_namespace.h

0 → 100644

+64 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		#pragma once
		#if defined(__ANDROID__)

		#include <dlfcn.h>

		#include "android-base/logging.h"
		#include "android/dlext.h"
		#include "log/log.h"
		#include "nativebridge/native_bridge.h"

		namespace android {

		// NativeLoaderNamespace abstracts a linker namespace for the native
		// architecture (ex: arm on arm) or the translated architecture (ex: arm on
		// x86). Instances of this class are managed by LibraryNamespaces object.
		struct NativeLoaderNamespace {
		public:
		NativeLoaderNamespace() : android_ns_(nullptr), native_bridge_ns_(nullptr) {}

		explicit NativeLoaderNamespace(android_namespace_t* ns)
		: android_ns_(ns), native_bridge_ns_(nullptr) {}

		explicit NativeLoaderNamespace(native_bridge_namespace_t* ns)
		: android_ns_(nullptr), native_bridge_ns_(ns) {}

		NativeLoaderNamespace(NativeLoaderNamespace&&) = default;
		NativeLoaderNamespace(const NativeLoaderNamespace&) = default;
		NativeLoaderNamespace& operator=(const NativeLoaderNamespace&) = default;

		android_namespace_t* get_android_ns() const {
		CHECK(native_bridge_ns_ == nullptr);
		return android_ns_;
		}

		native_bridge_namespace_t* get_native_bridge_ns() const {
		CHECK(android_ns_ == nullptr);
		return native_bridge_ns_;
		}

		bool is_android_namespace() const { return native_bridge_ns_ == nullptr; }

		private:
		// Only one of them can be not null
		android_namespace_t* android_ns_;
		native_bridge_namespace_t* native_bridge_ns_;
		};

		} // namespace android
		#endif // #if defined(__ANDROID__)