Merge "make apex init .XXrc parsing honour .35rc even though we're not yet sdk=35" into main am: a1188013f3
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3007926
Change-Id: Idc94ab90ac5267ef6e3f3fe1f7e11b44edbdbfc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/init/apex_init_util.cpp b/init/apex_init_util.cpp
index 6d17f36..e5a7fbc 100644
--- a/init/apex_init_util.cpp
+++ b/init/apex_init_util.cpp
@@ -107,8 +107,9 @@
}
// 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 {};
}