Change only_use_system_oat_files_ logic.

If we're creating a process which is a zygote, set it to true. Change it
to false on non-system-server fork.

This makes sure that zygote doesn't load oat files from /data, which
would then make system server abort at startup.

Test: 677-fsi, 677-fsi2
Bug: 198531508
Change-Id: I367fcf79f2e60a32457829ddc88b680fc2d00099

1 files changed, 2 insertions, 4 deletions

diff --git a/libartbase/base/file_utils.cc b/libartbase/base/file_utils.cc
index c6c1b50a71..884bca15b7 100644
--- a/libartbase/base/file_utils.cc
+++ b/libartbase/base/file_utils.cc
@@ -644,14 +644,12 @@ bool LocationIsOnSystem(const std::string& location) {
   LOG(FATAL) << "LocationIsOnSystem is unsupported on Windows.";
   return false;
 #else
-  UniqueCPtr<const char[]> full_path(realpath(location.c_str(), nullptr));
-  return full_path != nullptr &&
-      android::base::StartsWith(full_path.get(), GetAndroidRoot().c_str());
+  return android::base::StartsWith(location, GetAndroidRoot().c_str());
 #endif
 }
 
 bool LocationIsTrusted(const std::string& location, bool trust_art_apex_data_files) {
-  if (LocationIsOnSystem(location)) {
+  if (LocationIsOnSystem(location) || LocationIsOnArtModule(location)) {
     return true;
   }
   return LocationIsOnArtApexData(location) & trust_art_apex_data_files;