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

Commit 3a764c14 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "init: filter .##rc with preview SDK version" into main am: e4acb47b am: 9c2a9407 

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



Change-Id: I65befa6ad2ff82e8ac2df4b2f857a68634cd19d7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9f686da3 9c2a9407

init/apex_init_util.cpp

+9 −2
Original line number Diff line number Diff line
@@ -101,14 +101,21 @@ std::set<std::string> GetApexListFrom(const std::string& apex_dir) { 
    return apex_list;

}



static int GetCurrentSdk() {

    bool is_preview = base::GetProperty("ro.build.version.codename", "") != "REL";

    if (is_preview) {

        return __ANDROID_API_FUTURE__;

    }

    return android::base::GetIntProperty("ro.build.version.sdk", __ANDROID_API_FUTURE__);

}



static Result<void> ParseRcScripts(const std::vector<std::string>& files) {

    if (files.empty()) {

        return {};

    }

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

    // SDK version.

    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__+)

    static int sdk = GetCurrentSdk();

    auto filtered = FilterVersionedConfigs(files, sdk);

    if (filtered.empty()) {

        return {};