| commit | e5c759ff3a602f884cdac011600dc64645bce93e | [log] [tgz] |
|---|---|---|
| author | Dmitriy Ivanov <dimitry@google.com> | Mon Jun 30 17:53:49 2014 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Jun 26 23:39:54 2014 +0000 |
| tree | 8b40b8683780f6aea46525fcac76c8b94803a7c2 | |
| parent | ddc449748bc3ff0ba574be00f4bbac9fba242e33 [diff] | |
| parent | e43c4a7a665032a29cb5ec15d4adbf81ea199220 [diff] |
Merge "Disallow dlopen("egl/blah.so") on LP64"diff --git a/linker/linker.cpp b/linker/linker.cpp index e202aaf..b99c59a 100644 --- a/linker/linker.cpp +++ b/linker/linker.cpp
@@ -669,8 +669,7 @@ } // ...but nvidia binary blobs (at least) rely on this behavior, so fall through for now. #if defined(__LP64__) - // TODO: uncomment this after bug b/7465467 is fixed. - // return -1; + return -1; #endif }