Fixup for Bug 683127 part 11. r=me
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 20 Jan 2012 09:58:14 +0100
changeset 86202 f6cbf4661e213cde490fbfd618047d6c305bc438
parent 86201 283408b8d8a3724ef0f5ee2bce08e21ce3acb924
child 86203 740578328b88be11c9756b85f47b9f8ab89890ce
push id805
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 18:17:35 +0000
treeherdermozilla-aurora@6fb3bf232436 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs683127
milestone12.0a1
Fixup for Bug 683127 part 11. r=me
mozglue/android/SQLiteBridge.cpp
--- a/mozglue/android/SQLiteBridge.cpp
+++ b/mozglue/android/SQLiteBridge.cpp
@@ -34,17 +34,19 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
 #include <stdlib.h>
 #include <jni.h>
 #include <android/log.h>
 #include "dlfcn.h"
 #include "APKOpen.h"
+#ifndef MOZ_OLD_LINKER
 #include "ElfLoader.h"
+#endif
 #include "SQLiteBridge.h"
 
 #ifdef DEBUG
 #define LOG(x...) __android_log_print(ANDROID_LOG_INFO, "GeckoJNI", x)
 #else
 #define LOG(x...)
 #endif