diff options
| author | Ben Murdoch <benm@google.com> | 2016-09-16 13:49:30 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2016-09-23 11:30:04 +0100 |
| commit | 13e2dadd00298019ed862f2b2fc5068bba730bcf (patch) | |
| tree | 8d68955e70aae5b4afbfad61346ac5d6b9b1862e /src/startup-data-util.cc | |
| parent | 50c70ae05086e6572e0064594c698ae182e4a8bd (diff) | |
| download | android_external_v8-13e2dadd00298019ed862f2b2fc5068bba730bcf.tar.gz android_external_v8-13e2dadd00298019ed862f2b2fc5068bba730bcf.tar.bz2 android_external_v8-13e2dadd00298019ed862f2b2fc5068bba730bcf.zip | |
Merge V8 5.3.332.45.
Test: Manual
Change-Id: Id3254828b068abdea3cb10442e0172a8c9a98e03
Diffstat (limited to 'src/startup-data-util.cc')
| -rw-r--r-- | src/startup-data-util.cc | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/src/startup-data-util.cc b/src/startup-data-util.cc index 4e0ad97a..7c6d9ebf 100644 --- a/src/startup-data-util.cc +++ b/src/startup-data-util.cc @@ -7,6 +7,7 @@ #include <stdlib.h> #include <string.h> +#include "src/base/file-utils.h" #include "src/base/logging.h" #include "src/base/platform/platform.h" #include "src/utils.h" @@ -77,27 +78,6 @@ void LoadFromFiles(const char* natives_blob, const char* snapshot_blob) { atexit(&FreeStartupData); } - -char* RelativePath(char** buffer, const char* exec_path, const char* name) { - DCHECK(exec_path); - int path_separator = static_cast<int>(strlen(exec_path)) - 1; - while (path_separator >= 0 && - !base::OS::isDirectorySeparator(exec_path[path_separator])) { - path_separator--; - } - if (path_separator >= 0) { - int name_length = static_cast<int>(strlen(name)); - *buffer = - reinterpret_cast<char*>(calloc(path_separator + name_length + 2, 1)); - *buffer[0] = '\0'; - strncat(*buffer, exec_path, path_separator + 1); - strncat(*buffer, name, name_length); - } else { - *buffer = strdup(name); - } - return *buffer; -} - } // namespace #endif // V8_USE_EXTERNAL_STARTUP_DATA |