Merge "Populate only emulator specific properties into `ro.kernel.`" (7787e704) · Commits · e / os / android_system_core

init/property_service.cpp

+3 −11

Original line number	Diff line number	Diff line
		@@ -1166,21 +1166,13 @@ static void ProcessKernelDt() {
		constexpr auto ANDROIDBOOT_PREFIX = "androidboot."sv;

		static void ProcessKernelCmdline() {
		bool for_emulator = false;
		ImportKernelCmdline([&](const std::string& key, const std::string& value) {
		if (key == "qemu") {
		for_emulator = true;
		} else if (StartsWith(key, ANDROIDBOOT_PREFIX)) {
		if (StartsWith(key, ANDROIDBOOT_PREFIX)) {
		InitPropertySet("ro.boot." + key.substr(ANDROIDBOOT_PREFIX.size()), value);
		}
		});

		if (for_emulator) {
		ImportKernelCmdline([&](const std::string& key, const std::string& value) {
		// In the emulator, export any kernel option with the "ro.kernel." prefix.
		} else if (StartsWith(key, "qemu."sv) \|\| (key == "qemu")) {
		InitPropertySet("ro.kernel." + key, value);
		});
		}
		});
		}

		static void ProcessBootconfig() {