Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 696017ac authored by Alistair Delva's avatar Alistair Delva Committed by Automerger Merge Worker
Browse files

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I69eb9a76d3ac496401edaa0b7b2c90be84c4b58b
parents fe2a3026 7d0bfb19

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;

}