commit ce25cfb941a0c6fa6bf9e84f438c9687c000809f
author Kiyoung Kim <kiyoungkim@google.com> Wed Sep 27 04:57:15 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Sep 27 04:57:15 2023 +0000
tree 918a279756365d1907b85053f6519498c4e10f83
parent e063caece156a2ebe5cc484c3ed97c563be4e59f
parent 54b2ad4c79a46f7ac7a4c70f0c1c98267aedd2ed

Merge "Use ro.vndk.version to check if VNDK is deprecated" into main am: 553da45cd7 am: 4c168fc64c am: a2f1050292 am: 54b2ad4c79

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2762765

Change-Id: Ib79a9577a26d65969a971f2a29a6217704109428
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

libs/graphicsenv/GraphicsEnv.cpp

diff --git a/libs/graphicsenv/GraphicsEnv.cpp b/libs/graphicsenv/GraphicsEnv.cpp
index 4842476..ed5d5c1 100644
--- a/libs/graphicsenv/GraphicsEnv.cpp
+++ b/libs/graphicsenv/GraphicsEnv.cpp
@@ -63,8 +63,7 @@
 namespace {
 static bool isVndkEnabled() {
 #ifdef __BIONIC__
-    // TODO(b/290159430) Use ro.vndk.version to check if VNDK is enabled instead
-    static bool isVndkEnabled = !android::base::GetBoolProperty("ro.vndk.deprecate", false);
+    static bool isVndkEnabled = android::base::GetProperty("ro.vndk.version", "") != "";
     return isVndkEnabled;
 #endif
     return false;