commit 5e88a32def8c1ba2f4661fa0ee1fff47495c0506
author Maciej Żenczykowski <maze@google.com> Tue Mar 19 16:45:28 2024 -0700
committer Maciej Żenczykowski <maze@google.com> Mon May 20 14:25:56 2024 +0000
tree fd7f10c88f9d3ffac87b1f853618d6ea4d48be1c
parent f52256ea25c58940f344b7251c942340d2b4f0b9

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

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I315cfe77c60988d8cdc8ef64bf8cb2f5c37c93db

init/apex_init_util.cpp

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