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

Commit 00f84319 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Allow a kernel bootconfig to set the `qemu` key" am: 6cbc7e01 am:... 

Merge "Allow a kernel bootconfig to set the `qemu` key" am: 6cbc7e01 am: 0d13e937 am: 57f01c51 am: 277178c2

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

Change-Id: Ia65da29fa79a97ac63e1f9aca3630653179548c8
parents dd4b58f8 277178c2

init/property_service.cpp

+10 −3
Original line number Diff line number Diff line
@@ -1218,13 +1218,20 @@ static void ProcessKernelCmdline() { 
    });

}



// bootconfig does not allow to populate `key=value` simultaneously with

// `key.subkey=value` which does not work with the existing code for

// `hardware` (e.g. we want both `ro.boot.hardware=value` and

// `ro.boot.hardware.sku=value`) and for `qemu` (Android Stidio Emulator

// specific).

static bool IsAllowedBootconfigKey(const std::string_view key) {

    return (key == "hardware"sv) || (key == "qemu"sv);

}



static void ProcessBootconfig() {

    ImportBootconfig([&](const std::string& key, const std::string& value) {

        if (StartsWith(key, ANDROIDBOOT_PREFIX)) {

            InitPropertySet("ro.boot." + key.substr(ANDROIDBOOT_PREFIX.size()), value);

        } else if (key == "hardware") {

            // "hardware" in bootconfig replaces "androidboot.hardware" kernel

            // cmdline parameter

        } else if (IsAllowedBootconfigKey(key)) {

            InitPropertySet("ro.boot." + key, value);

        }

    });