commit 335e35bc747c7eab7f260b2b350f83133871eb1f
author Kiyoung Kim <kiyoungkim@google.com> Sun Sep 29 19:24:17 2019 -0700
committer android-build-merger <android-build-merger@google.com> Sun Sep 29 19:24:17 2019 -0700
tree 4af13d97b8a921dcce90f35813239e8265583875
parent 429e2e97e3ba7ad52cf88c07bcd6afdfd1515e4a
parent 6856c3e758e277120c84f662fc32bf74b8a41ad2

Load VNDK using core variant library list am: 18eb4c6465 am: 50e4b94b77
am: 6856c3e758

Change-Id: I9fbc7525ea72cef07242175598942a9994e00d73

generator/variableloader.cc

diff --git a/generator/variableloader.cc b/generator/variableloader.cc
index 4e649d0..8f6a8a7 100644
--- a/generator/variableloader.cc
+++ b/generator/variableloader.cc
@@ -76,6 +76,9 @@
       root + "/system/etc/vndksp.libraries." + GetVendorVndkVersion() + ".txt";
   auto vndkcore_library_path = root + "/system/etc/vndkcore.libraries." +
                                GetVendorVndkVersion() + ".txt";
+  auto vndkcorevariant_library_path = root +
+                                      "/system/etc/vndkcorevariant.libraries." +
+                                      GetVendorVndkVersion() + ".txt";
   auto sanitizer_library_path = root + "/system/etc/sanitizer.libraries.txt";
 
   Variables::AddValue(
@@ -94,6 +97,10 @@
       "VNDK_CORE_LIBRARIES",
       GetPublicLibrariesString(vndkcore_library_path, private_library_path));
 
+  Variables::AddValue("VNDK_USING_CORE_VARIANT_LIBRARIES",
+                      GetPublicLibrariesString(vndkcorevariant_library_path,
+                                               private_library_path));
+
   Variables::AddValue("SANITIZER_RUNTIME_LIBRARIES",
                       GetLibrariesString(sanitizer_library_path));
 }

modules/environment.cc

diff --git a/modules/environment.cc b/modules/environment.cc
index 4f6a7ba..d79c066 100644
--- a/modules/environment.cc
+++ b/modules/environment.cc
@@ -29,7 +29,6 @@
 }
 
 bool IsVndkInSystemNamespace() {
-  // TODO : Implement
   return Variables::GetValue("VNDK_USING_CORE_VARIANT_LIBRARIES").has_value();
 }