Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54b2ad4c authored by Kiyoung Kim's avatar Kiyoung Kim Committed by Automerger Merge Worker
Browse files

Merge "Use ro.vndk.version to check if VNDK is deprecated" into main am:...

Merge "Use ro.vndk.version to check if VNDK is deprecated" into main am: 553da45c am: 4c168fc6 am: a2f10502

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



Change-Id: I48f46388155869501512e57063cbfd6340f9f0b4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bf15340c a2f10502
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -63,8 +63,7 @@ typedef bool (*fpANGLEFreeSystemInfoHandle)(void* handle);
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;