commit ce504b597e0d37803a74b02088be47a7e3a92ff4
author Daichi Hirono <hirono@google.com> Wed Oct 30 00:02:54 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Oct 30 00:02:54 2019 -0700
tree c80c8df76cebcd3145c47db97a9a22f2fcc07c88
parent 3e04079e128da32ec8e9389472b0d5efadbda1ee
parent a9dc08c8cd4a4f24f1cb41bfeab78fd4121e5be5

Merge "Revert "Check ro.treble.enabled for legacy devices""
am: a9dc08c8cd

Change-Id: I7812fde519f6da46699a966d0b1e0f0c418956f4

modules/environment.cc

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