commit 54b2ad4c79a46f7ac7a4c70f0c1c98267aedd2ed
author Kiyoung Kim <kiyoungkim@google.com> Wed Sep 27 04:09:06 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Sep 27 04:09:06 2023 +0000
tree d857189118216f3871a1b512c4d9aa329d0c33a2
parent bf15340c2b90e7feb4d7b1995b399269a076cd90
parent a2f10502922a8a02d2e670964fa36c5917db51b4

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

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

Change-Id: I48f46388155869501512e57063cbfd6340f9f0b4
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 9d3e674..16315ed 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;