Update paths and names for the new ART APEX. (bb55e077) · Commits · e / os / android_system_core

init/mount_namespace.cpp

+7 −7

Original line number	Diff line number	Diff line
		@@ -91,22 +91,22 @@ static bool ActivateFlattenedApexesIfPossible() {
		return false;
		}

		// Special casing for the runtime APEX
		constexpr const char kRuntimeApexMountPath[] = "/system/apex/com.android.runtime";
		static const std::vector<std::string> kRuntimeApexDirNames = {"com.android.runtime.release",
		"com.android.runtime.debug"};
		// Special casing for the ART APEX
		constexpr const char kArtApexMountPath[] = "/system/apex/com.android.art";
		static const std::vector<std::string> kArtApexDirNames = {"com.android.art.release",
		"com.android.art.debug"};
		bool success = false;
		for (const auto& name : kRuntimeApexDirNames) {
		for (const auto& name : kArtApexDirNames) {
		std::string path = std::string(kSystemApex) + "/" + name;
		if (access(path.c_str(), F_OK) == 0) {
		if (mount(path.c_str(), kRuntimeApexMountPath, nullptr, MS_BIND, nullptr) == 0) {
		if (mount(path.c_str(), kArtApexMountPath, nullptr, MS_BIND, nullptr) == 0) {
		success = true;
		break;
		}
		}
		}
		if (!success) {
		PLOG(ERROR) << "Failed to bind mount the runtime APEX to " << kRuntimeApexMountPath;
		PLOG(ERROR) << "Failed to bind mount the ART APEX to " << kArtApexMountPath;
		}
		return success;
		}

libnativeloader/native_loader.cpp

+4 −0

Original line number	Diff line number	Diff line
		@@ -63,6 +63,10 @@ android_namespace_t* FindExportedNamespace(const char* caller_location) {
		LOG_ALWAYS_FATAL_IF((dot_index == std::string::npos),
		"Error finding namespace of apex: no dot in apex name %s", caller_location);
		std::string name = location.substr(dot_index + 1, slash_index - dot_index - 1);
		// TODO(b/139408016): Rename the runtime namespace to "art".
		if (name == "art") {
		name = "runtime";
		}
		android_namespace_t* boot_namespace = android_get_exported_namespace(name.c_str());
		LOG_ALWAYS_FATAL_IF((boot_namespace == nullptr),
		"Error finding namespace of apex: no namespace called %s", name.c_str());

libnativeloader/public_libraries.cpp

+8 −8

Original line number	Diff line number	Diff line
		@@ -49,12 +49,12 @@ constexpr const char* kVendorPublicLibrariesFile = "/vendor/etc/public.libraries
		constexpr const char* kLlndkLibrariesFile = "/system/etc/llndk.libraries.txt";
		constexpr const char* kVndkLibrariesFile = "/system/etc/vndksp.libraries.txt";

		const std::vector<const std::string> kRuntimePublicLibraries = {
		const std::vector<const std::string> kArtApexPublicLibraries = {
		"libicuuc.so",
		"libicui18n.so",
		};

		constexpr const char* kRuntimeApexLibPath = "/apex/com.android.runtime/" LIB;
		constexpr const char* kArtApexLibPath = "/apex/com.android.art/" LIB;

		constexpr const char* kNeuralNetworksApexPublicLibrary = "libneuralnetworks.so";

		@@ -182,8 +182,8 @@ static std::string InitDefaultPublicLibraries(bool for_preload) {
		// For example, libicuuc.so is exposed to classloader namespace from runtime namespace.
		// Unfortunately, it does not have stable C symbols, and default namespace should only use
		// stable symbols in libandroidicu.so. http://b/120786417
		for (const std::string& lib_name : kRuntimePublicLibraries) {
		std::string path(kRuntimeApexLibPath);
		for (const std::string& lib_name : kArtApexPublicLibraries) {
		std::string path(kArtApexLibPath);
		path.append("/").append(lib_name);

		struct stat s;
		@@ -207,9 +207,9 @@ static std::string InitDefaultPublicLibraries(bool for_preload) {
		return android::base::Join(*sonames, ':');
		}

		static std::string InitRuntimePublicLibraries() {
		CHECK(sizeof(kRuntimePublicLibraries) > 0);
		std::string list = android::base::Join(kRuntimePublicLibraries, ":");
		static std::string InitArtPublicLibraries() {
		CHECK(sizeof(kArtApexPublicLibraries) > 0);
		std::string list = android::base::Join(kArtApexPublicLibraries, ":");

		std::string additional_libs = additional_public_libraries();
		if (!additional_libs.empty()) {
		@@ -277,7 +277,7 @@ const std::string& default_public_libraries() {
		}

		const std::string& runtime_public_libraries() {
		static std::string list = InitRuntimePublicLibraries();
		static std::string list = InitArtPublicLibraries();
		return list;
		}

rootdir/Android.mk

+4 −4

Original line number	Diff line number	Diff line
		@@ -214,7 +214,7 @@ LOCAL_MODULE := ld.config.txt
		LOCAL_MODULE_CLASS := ETC
		LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)

		# Start of runtime APEX compatibility.
		# Start of i18n and ART APEX compatibility.
		#
		# Meta-comment:
		# The placing of this section is somewhat arbitrary. The LOCAL_POST_INSTALL_CMD
		@@ -226,7 +226,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)
		# come to rely on them.

		# http://b/121248172 - create a link from /system/usr/icu to
		# /apex/com.android.runtime/etc/icu so that apps can find the ICU .dat file.
		# /apex/com.android.i18n/etc/icu so that apps can find the ICU .dat file.
		# A symlink can't overwrite a directory and the /system/usr/icu directory once
		# existed so the required structure must be created whatever we find.
		LOCAL_POST_INSTALL_CMD = mkdir -p $(TARGET_OUT)/usr && rm -rf $(TARGET_OUT)/usr/icu
		@@ -248,10 +248,10 @@ ART_BINARIES := \
		LOCAL_POST_INSTALL_CMD += && mkdir -p $(TARGET_OUT)/bin
		$(foreach b,$(ART_BINARIES), \
		$(eval LOCAL_POST_INSTALL_CMD += \
		&& ln -sf /apex/com.android.runtime/bin/$(b) $(TARGET_OUT)/bin/$(b)) \
		&& ln -sf /apex/com.android.art/bin/$(b) $(TARGET_OUT)/bin/$(b)) \
		)

		# End of runtime APEX compatibilty.
		# End of i18n and ART APEX compatibilty.

		ifeq ($(_enforce_vndk_at_runtime),true)

rootdir/etc/ld.config.legacy.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -85,8 +85,8 @@ namespace.runtime.isolated = true
		# android_link_namespaces in libnativeloader.
		namespace.runtime.visible = true

		namespace.runtime.search.paths = /apex/com.android.runtime/${LIB}
		namespace.runtime.asan.search.paths = /apex/com.android.runtime/${LIB}
		namespace.runtime.search.paths = /apex/com.android.art/${LIB}
		namespace.runtime.asan.search.paths = /apex/com.android.art/${LIB}
		namespace.runtime.links = default
		# Need allow_all_shared_libs because libart.so can dlopen oat files in
		# /system/framework and /data.