commit 990dfcffdc2e6a56d10beb966f8b9cd3fa980f7c
author Treehugger Robot <treehugger-gerrit@google.com> Tue Oct 29 23:42:23 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 29 23:42:23 2019 +0000
tree 0808e30d823bbb59aeb906ddffea45cf24731769
parent 54de6a01ed0f27dac163234e47bc63dcf432a852
parent 7343a1dc1513036c3122874076db43878037c18f

Merge "Check ro.treble.enabled for legacy devices"

modules/environment.cc

diff --git a/modules/environment.cc b/modules/environment.cc
index 198e1e9..db9c501 100644
--- a/modules/environment.cc
+++ b/modules/environment.cc
@@ -21,8 +21,9 @@
 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() {