Merge "Revert "init: Wait for /dev/hvc1 during ARCVM first-stage mount"" into main (f3489093) · Commits · e / os / android_system_core

init/first_stage_mount.cpp

+0 −5

Original line number	Diff line number	Diff line
		@@ -305,11 +305,6 @@ bool FirstStageMountVBootV2::InitDevices() {
		return false;
		}
		}

		if (IsArcvm() && !block_dev_init_.InitHvcDevice("hvc1")) {
		return false;
		}

		return true;
		}

+0 −2

Original line number	Diff line number	Diff line
		@@ -474,8 +474,6 @@ void SelinuxRestoreContext() {
		RestoreconIfExists(SnapshotManager::GetGlobalRollbackIndicatorPath().c_str(), 0);
		RestoreconIfExists("/metadata/gsi",
		SELINUX_ANDROID_RESTORECON_RECURSE \| SELINUX_ANDROID_RESTORECON_SKIP_SEHASH);

		RestoreconIfExists("/dev/hvc1", 0);
		}

		int SelinuxKlogCallback(int type, const char* fmt, ...) {

+0 −5

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@

		#include <sys/stat.h>
		#include <sys/types.h>
		#include <sys/unistd.h>

		#include <chrono>
		#include <functional>
		@@ -109,10 +108,6 @@ inline constexpr bool IsMicrodroid() {
		#endif
		}

		inline bool IsArcvm() {
		return !access("/is_arcvm", F_OK);
		}

		bool Has32BitAbi();

		std::string GetApexNameFromFileName(const std::string& path);