Commit 5ad9bd5c authored Mar 11, 2021 by Alistair Delva Committed by Automerger Merge Worker Mar 11, 2021

Allow android_dt_dir to be set by bootconfig am: 3bb240bd am: 7d0bfb19 am:...

Allow android_dt_dir to be set by bootconfig am: 3bb240bd am: 7d0bfb19 am: 696017ac am: 4ea63b72

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1624583

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia42d583d80552058de52446d8bcdd4699fbcf024

init/util.cpp

+9 −0

Original line number	Diff line number	Diff line
		@@ -376,6 +376,15 @@ static std::string init_android_dt_dir() {
		android_dt_dir = value;
		}
		});
		// ..Or bootconfig
		if (android_dt_dir == kDefaultAndroidDtDir) {
		ImportBootconfig([&](const std::string& key, const std::string& value) {
		if (key == "androidboot.android_dt_dir") {
		android_dt_dir = value;
		}
		});
		}

		LOG(INFO) << "Using Android DT directory " << android_dt_dir;
		return android_dt_dir;
		}