commit 0adea49cae5e62a11cde55f45687e52ea53b0b8e
author Daichi Hirono <hirono@google.com> Wed Oct 30 00:07:53 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Oct 30 00:07:53 2019 -0700
tree c80c8df76cebcd3145c47db97a9a22f2fcc07c88
parent 056eed24ef17c0e2390b90170babf8383e65d25c
parent ce504b597e0d37803a74b02088be47a7e3a92ff4

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

Change-Id: I581e57ea4a3fa123ddf4984777d0523f21f4e3ae

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() {