Use ro.vndk.version to check if VNDK is deprecated
ro.vndk.version will not be set if VNDK is deprecated. This change reads
ro.vndk.version instead of temp property to check if the device is VNDK
deprecated.
Bug: 290159430
Test: Cuttlefish build and run succeeded
Change-Id: I7ef2341872fb8dcd1a2ca5e0c853ada06d6726ac
diff --git a/libs/graphicsenv/GraphicsEnv.cpp b/libs/graphicsenv/GraphicsEnv.cpp
index 64f8704..701a3b2 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;