commit e7e26d10a7a1446b42c00104b162bf07e7c01a04
author David Brazdil <dbrazdil@google.com> Thu Feb 28 15:04:14 2019 +0000
committer David Brazdil <dbrazdil@google.com> Tue Mar 05 15:17:01 2019 +0000
tree fb571d4903a499d9effae5940440af5159b8548e
parent 815d5e5304a5b57db64d6829813a14e464d5c55f

Assign non-runtime /apex/* dex files to platform domain

Until now only /system/framework and /apex/com.android.runtime were
known locations, assigning "platform" domain to the former and
"core-platform" domain to the latter. The media and conscrypt modules
were left in the "application" domain.

This patch adds a hardcoded path to the apex root and assigns all dex
files in subdirectories to the "platform" domain. This affects both
conscrypt and media modules.

Any other dex files on boot classpath are also assigned to "platform"
on first access. A warning is printed in such case and it is now deduped
to avoid logspam.

Bug: 125701194
Bug: 119068555
Test: compiles, boots, no conscrypt/media warnings about missing domain
Test: art/test.py -b -r -t 674
Change-Id: I33bef18459741095d3d99b541fc88b21cf547800

libartbase/base/file_utils.cc

diff --git a/libartbase/base/file_utils.cc b/libartbase/base/file_utils.cc
index 2436e45..9e49d05 100644
--- a/libartbase/base/file_utils.cc
+++ b/libartbase/base/file_utils.cc
@@ -65,6 +65,9 @@
 using android::base::StringPrintf;
 
 static constexpr const char* kClassesDex = "classes.dex";
+static constexpr const char* kApexDefaultPath = "/apex/";
+static constexpr const char* kRuntimeApexEnvVar = "ANDROID_RUNTIME_ROOT";
+static constexpr const char* kRuntimeApexDefaultPath = "/apex/com.android.runtime";
 
 bool ReadFileToString(const std::string& file_name, std::string* result) {
   File file(file_name, O_RDONLY, false);
@@ -284,8 +287,8 @@
 
 bool LocationIsOnRuntimeModule(const char* full_path) {
   std::string error_msg;
-  const char* runtime_path = GetAndroidDirSafe("ANDROID_RUNTIME_ROOT",
-                                               "/apex/com.android.runtime",
+  const char* runtime_path = GetAndroidDirSafe(kRuntimeApexEnvVar,
+                                               kRuntimeApexDefaultPath,
                                                &error_msg);
   if (runtime_path == nullptr) {
     return false;
@@ -293,6 +296,10 @@
   return android::base::StartsWith(full_path, runtime_path);
 }
 
+bool LocationIsOnApex(const char* full_path) {
+  return android::base::StartsWith(full_path, kApexDefaultPath);
+}
+
 bool LocationIsOnSystem(const char* path) {
 #ifdef _WIN32
   UNUSED(path);

libartbase/base/file_utils.h

diff --git a/libartbase/base/file_utils.h b/libartbase/base/file_utils.h
index c8eca59..88dcbea 100644
--- a/libartbase/base/file_utils.h
+++ b/libartbase/base/file_utils.h
@@ -75,7 +75,7 @@
 //          ReplaceFileExtension("foo", "abc") == "foo.abc"
 std::string ReplaceFileExtension(const std::string& filename, const std::string& new_extension);
 
-// Return whether the location is on apex/com.android.runtime
+// Return whether the location is on /apex/com.android.runtime
 bool LocationIsOnRuntimeModule(const char* location);
 
 // Return whether the location is on system (i.e. android root).
@@ -84,6 +84,9 @@
 // Return whether the location is on system/framework (i.e. android_root/framework).
 bool LocationIsOnSystemFramework(const char* location);
 
+// Return whether the location is on /apex/.
+bool LocationIsOnApex(const char* location);
+
 // dup(2), except setting the O_CLOEXEC flag atomically, when possible.
 int DupCloexec(int fd);