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

Commit 5e88a32d authored by Maciej Żenczykowski's avatar Maciej Żenczykowski
Browse files

make apex init .XXrc parsing honour .35rc even though we're not yet sdk=35 



Test: TreeHugger
Signed-off-by: default avatarMaciej Żenczykowski <maze@google.com>
Change-Id: I315cfe77c60988d8cdc8ef64bf8cb2f5c37c93db
parent f52256ea

init/apex_init_util.cpp

+3 −2
Original line number Diff line number Diff line
@@ -107,8 +107,9 @@ static Result<void> ParseRcScripts(const std::vector<std::string>& files) { 
    }

    // APEXes can have versioned RC files. These should be filtered based on

    // SDK version.

    auto filtered = FilterVersionedConfigs(

            files, android::base::GetIntProperty("ro.build.version.sdk", INT_MAX));

    int sdk = android::base::GetIntProperty("ro.build.version.sdk", INT_MAX);

    if (sdk < 35) sdk = 35;  // aosp/main merges only into sdk=35+ (ie. __ANDROID_API_V__+)

    auto filtered = FilterVersionedConfigs(files, sdk);

    if (filtered.empty()) {

        return {};

    }