diff options
| author | Elliott Hughes <enh@google.com> | 2013-05-14 17:58:33 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2013-05-14 21:38:54 -0700 |
| commit | 41d00b744b7772f9302fdb94dddadb165b951220 (patch) | |
| tree | 3cf8122cf23c5acb65dd512935727b023eee22dc /libdvm/src/main/java/dalvik | |
| parent | e95612e19f51b0fbcc9196e7a07737388010a4ea (diff) | |
| download | libcore-41d00b744b7772f9302fdb94dddadb165b951220.zip libcore-41d00b744b7772f9302fdb94dddadb165b951220.tar.gz libcore-41d00b744b7772f9302fdb94dddadb165b951220.tar.bz2 | |
Simplify defaulting for system properties, and trust the environment less.
The originally-reported bug (https://android-review.googlesource.com/58258)
was that dalvik would fail to start if LD_LIBRARY_PATH was unset.
This changes things so we no longer have multiple default values for
java.library.path, cope better with that not being set, and don't set
it if LD_LIBRARY_PATH isn't set.
Change-Id: I55d48a35b1b42df872e6dcd0a38fc7bc4b8cad5a
Diffstat (limited to 'libdvm/src/main/java/dalvik')
| -rw-r--r-- | libdvm/src/main/java/dalvik/system/DexPathList.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libdvm/src/main/java/dalvik/system/DexPathList.java b/libdvm/src/main/java/dalvik/system/DexPathList.java index 3d9ee3e..a10e90e 100644 --- a/libdvm/src/main/java/dalvik/system/DexPathList.java +++ b/libdvm/src/main/java/dalvik/system/DexPathList.java @@ -148,8 +148,7 @@ import static libcore.io.OsConstants.*; * * This order was reversed prior to Gingerbread; see http://b/2933456. */ - ArrayList<File> result = splitPaths( - path, System.getProperty("java.library.path", "."), true); + ArrayList<File> result = splitPaths(path, System.getProperty("java.library.path"), true); return result.toArray(new File[result.size()]); } |