summaryrefslogtreecommitdiff
path: root/core/jni/fd_utils.cpp
diff options
context:
space:
mode:
authorMartin Stjernholm <mast@google.com>2019-07-17 22:10:40 +0100
committerMartin Stjernholm <mast@google.com>2019-08-30 17:47:31 +0100
commit28f0a764865f0bfb47ebfd2038d85fdcac9f4143 (patch)
treec5216e37a8e69e0af448a414500da8a84374b409 /core/jni/fd_utils.cpp
parentf2c7d5c49d2390ce5a320844a395cdfa0a80047a (diff)
Update path to the new ART APEX.
Test: atest CtsJniTestCases Bug: 135753770 Exempt-From-Owner-Approval: Approved internally Change-Id: Ica35fc7f6adade19160cbb16adf5647d189ecc45 Merged-In: Ica35fc7f6adade19160cbb16adf5647d189ecc45
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 6d10fc2b37db..7a8bc93de59f 100644
--- a/core/jni/fd_utils.cpp
+++ b/core/jni/fd_utils.cpp
@@ -79,9 +79,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;
}