ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow android_dt_dir to be set by bootconfig am: 3bb240bd4c am: 7d0bfb1956

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I69eb9a76d3ac496401edaa0b7b2c90be84c4b58b
This commit is contained in:
Alistair Delva 2021-03-11 16:37:45 +00:00 • committed by Automerger Merge Worker
commit 696017ac7c
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
init/util.cpp
View file

@ -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;
}