commit 3a0053e86ae85ae94df41c18e93a8ce0e821c610
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Jun 17 20:45:22 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 17 20:45:22 2024 +0000
tree 88ebb171f1001ad6e515f2f53560b01ae78c4e59
parent a1188013f39300728b06336b37c4dcf6f55d1d49
parent 14fbf6d3909dab706568d1c409a941d5fd2a7428

Merge "Revert "snapuserd: Don't statically link outside of ramdisk."" into main

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