diff options
| author | Scott Lobdell <slobdell@google.com> | 2021-04-07 05:35:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-04-07 05:35:55 +0000 |
| commit | ec6cfacad7283c60a33cfefacf5031247a2f81dc (patch) | |
| tree | 5b473e86fc8ab0afc2241b6ac25875b25fa354bd /init/util.cpp | |
| parent | 79aff2b0a0653fcafaf9099ad60075f2903e8de1 (diff) | |
| parent | 268fff7088f0ab311c2de902178054ce40a42243 (diff) | |
Merge "Merge SP1A.210329.001" into s-keystone-qcom-dev
Diffstat (limited to 'init/util.cpp')
| -rw-r--r-- | init/util.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/init/util.cpp b/init/util.cpp index eab99d4e3..a40d10416 100644 --- a/init/util.cpp +++ b/init/util.cpp @@ -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; } |