diff options
| author | Martin Stjernholm <mast@google.com> | 2019-09-02 10:28:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-09-02 10:28:30 +0000 |
| commit | 0a4cf715f6c6db263ebcadb729b6444ad067a52b (patch) | |
| tree | cee6171725ffb58a805ce39f8437ec31ff666a56 /core/jni/fd_utils.cpp | |
| parent | 288c75d055981e708dd6e752df38713fa2633fff (diff) | |
| parent | 28f0a764865f0bfb47ebfd2038d85fdcac9f4143 (diff) | |
Merge "Update path to the new ART APEX."
Diffstat (limited to 'core/jni/fd_utils.cpp')
| -rw-r--r-- | core/jni/fd_utils.cpp | 6 |
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; } |