Check ro.treble.enabled for legacy devices

If ro.treble.enabled is "false", the device should use legacy config.

Bug: 143495511
Test: None
Change-Id: I913df5b9feedffa6474527a3ca17d4852e631cb5

diff --git a/modules/environment.cc b/modules/environment.cc
index 198e1e9..db9c501 100644 (file)
--- a/modules/environment.cc
+++ b/modules/environment.cc
@@ -21,8 +21,9 @@ namespace android {
 namespace linkerconfig {
 namespace modules {
 bool IsLegacyDevice() {
-  return !Variables::GetValue("ro.vndk.version").has_value() &&
-         !Variables::GetValue("ro.vndk.lite").has_value();
+  return (!Variables::GetValue("ro.vndk.version").has_value() &&
+          !Variables::GetValue("ro.vndk.lite").has_value()) ||
+         Variables::GetValue("ro.treble.enabled") == "false";
 }
 
 bool IsVndkLiteDevice() {