commit b63a99a4159138f82fb161cdc95e5de43ffc15c6
author Nick Desaulniers <ndesaulniers@google.com> Tue Dec 28 13:58:51 2021 -0800
committer Nick Desaulniers <ndesaulniers@google.com> Fri Jan 07 16:41:32 2022 -0800
tree 147b2a1fe5eb9087008b35cf3b4d3bbb8a4da654
parent 3c9b6a8fe9d263e9e9e10ab15710f50463ca117b

vts: kernel: toolchain: prefer ro.vendor.api_level over ro.product.first_api_level

ro.board.first_api_level
seems to be the preferred property for devices launching at S but
with vendor implementation frozen at R, according to:
https://docs.partner.android.com/gms/building/integrating/extending-os-upgrade-support-windows#new-system-properties
https://docs.partner.android.com/gms/building/integrating/extending-os-upgrade-support-windows#example_grf_chipset_3
but it may not be defined for non-GRF chipsets. Prefer
ro.vendor.api_level.

Bug: 210928656
Test: mm && adb sync data && \
      adb shell /data/nativetest/vts_kernel_toolchain/vts_kernel_toolchain
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
Change-Id: I7e9ef19b8349eca77315b6c7aa89eea01e308ab3

toolchain/vts_kernel_toolchain.cpp

diff --git a/toolchain/vts_kernel_toolchain.cpp b/toolchain/vts_kernel_toolchain.cpp
index 8643d34..a491914 100644
--- a/toolchain/vts_kernel_toolchain.cpp
+++ b/toolchain/vts_kernel_toolchain.cpp
@@ -34,8 +34,8 @@
   std::string version_;
   KernelVersionTest()
       : arch_(android::base::GetProperty("ro.bionic.arch", "")),
-        first_api_level_(std::stoi(
-            android::base::GetProperty("ro.product.first_api_level", "0"))),
+        first_api_level_(
+            std::stoi(android::base::GetProperty("ro.vendor.api_level", "0"))),
         should_run_compiler_test_(
             first_api_level_ >= __ANDROID_API_R__ ||
             (arch_ == "arm64" && first_api_level_ >= __ANDROID_API_Q__)),