diff options
| author | Kiyoung Kim <kiyoungkim@google.com> | 2023-09-27 02:08:31 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-09-27 02:08:31 +0000 |
| commit | 4c168fc64ceab314a7524c2cfca750660a538068 (patch) | |
| tree | e335ab032e3c3a184f10fd7a19330512663d9453 | |
| parent | 665ff52b478ccb56bbfb31cf3099207e5c04bcb0 (diff) | |
| parent | 553da45cd7f4704f4466bbc113c5ef58a04cbc2c (diff) | |
| download | native-4c168fc64ceab314a7524c2cfca750660a538068.tar.gz | |
Merge "Use ro.vndk.version to check if VNDK is deprecated" into main am: 553da45cd7
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2762765
Change-Id: I0a52a64a0d8e27cbe90ea88115abf4bef9609ff6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/graphicsenv/GraphicsEnv.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libs/graphicsenv/GraphicsEnv.cpp b/libs/graphicsenv/GraphicsEnv.cpp index 9d3e674d6c..16315ed858 100644 --- a/libs/graphicsenv/GraphicsEnv.cpp +++ b/libs/graphicsenv/GraphicsEnv.cpp @@ -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; |