summaryrefslogtreecommitdiff
path: root/core/jni/fd_utils.cpp
diff options
context:
space:
mode:
authorMartin Stjernholm <mast@google.com>2019-09-02 03:44:58 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-09-02 03:44:58 -0700
commitca19446d9a3b3dfc0ef54f3a51ed3a748c02c1e4 (patch)
tree63b7fb583ea05555e1cda720d84d5144646271b6 /core/jni/fd_utils.cpp
parentc8cc5781e0592164e35fa94669dd187f5a81a405 (diff)
parent0a4cf715f6c6db263ebcadb729b6444ad067a52b (diff)
Merge "Update path to the new ART APEX."
am: 0a4cf715f6 Change-Id: I7ab8cd227ce571041293880dfaca4e2ebb68e536
Diffstat (limited to 'core/jni/fd_utils.cpp')
-rw-r--r--core/jni/fd_utils.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/jni/fd_utils.cpp b/core/jni/fd_utils.cpp
index e5d6393530e4..18448d20ed71 100644
--- a/core/jni/fd_utils.cpp
+++ b/core/jni/fd_utils.cpp
@@ -80,9 +80,9 @@ bool FileDescriptorWhitelist::IsAllowed(const std::string& path) const {
return true;
}
- // Jars from the runtime apex are allowed.
- static const char* kRuntimeApexPrefix = "/apex/com.android.runtime/javalib/";
- if (android::base::StartsWith(path, kRuntimeApexPrefix)
+ // Jars from the ART APEX are allowed.
+ static const char* kArtApexPrefix = "/apex/com.android.art/javalib/";
+ if (android::base::StartsWith(path, kArtApexPrefix)
&& android::base::EndsWith(path, kJarSuffix)) {
return true;
}