ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "init: filter .##rc with preview SDK version" into main

Browse source
This commit is contained in:
Treehugger Robot 2024-10-24 08:02:49 +00:00 • committed by Gerrit Code Review
commit e4acb47ba9
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
init/apex_init_util.cpp
View file

@ -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 {};