Load VNDK using core variant library list am: 18eb4c6465
am: 50e4b94b77
Change-Id: I415499ce5fe7ffe710d9303ec8d1d54f534030a0
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));
}
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();
}