commit 65c91df324ddbc64e641307238fe202467ed4d8e
author Daichi Hirono <hirono@google.com> Tue Oct 29 16:59:49 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Oct 29 16:59:49 2019 -0700
tree 0808e30d823bbb59aeb906ddffea45cf24731769
parent eea505744e7a196e7f10c63e58513c61883a0a63
parent f7a0db4aa25f7af168350733f7e36121eef3daa8

Merge "Check ro.treble.enabled for legacy devices" am: 990dfcffdc
am: f7a0db4aa2

Change-Id: Ie7a3f15d38d6168ce7935aa7ea03107484372fd2

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