Added rules to build 64-bit libraries for 64-bit emulator

All ten libraries can now be built in 64-bit named "lib64*" (*)
in addition to the original 32-bit form named "lib*".

Also, dlopen "lib64*so" in 64-bit.

(*) eg. In Ubuntu, all can be built with the following command:
  make out/host/linux-x86/lib/lib64OpenglRender.so \
       out/host/linux-x86/lib/lib64EGL_translator.so \
       out/host/linux-x86/lib/lib64GLES_CM_translator.so \
       out/host/linux-x86/lib/lib64GLES_V2_translator.so

Rules to build static libraries lib64log.a, lib64cutils.a and lib64utils.a
they depend were added in other CLs.

Change-Id: I3afb64de6dda1d55dbd1b4443d2dbc78a683b19f

tools/emulator/opengl/shared/OpenglOsUtils/Android.mk

@@ -21,28 +21,37 @@ $(call emugl-end-module)
 
 
 ### Host library ##############################################
+
+host_common_SRC_FILES := osDynLibrary.cpp
+host_common_LDLIBS :=
+
+ifeq ($(HOST_OS),windows)
+    host_common_SRC_FILES += \
+        osProcessWin.cpp \
+        osThreadWin.cpp
+    host_common_LDLIBS += -lws2_32 -lpsapi
+else
+    host_common_SRC_FILES += \
+        osProcessUnix.cpp \
+        osThreadUnix.cpp
+    host_common_LDLIBS += -ldl
+endif
+
+ifeq ($(HOST_OS),linux)
+    host_common_LDLIBS += -lpthread -lrt
+endif
+
+### 32-bit host library ####
 $(call emugl-begin-host-static-library,libOpenglOsUtils)
-
     $(call emugl-export,C_INCLUDES,$(LOCAL_PATH))
-
-    LOCAL_SRC_FILES := osDynLibrary.cpp
-
-    ifeq ($(HOST_OS),windows)
-        LOCAL_SRC_FILES += \
-            osProcessWin.cpp \
-            osThreadWin.cpp
-
-        $(call emugl-export,LDLIBS,-lws2_32 -lpsapi)
-    else
-        LOCAL_SRC_FILES += \
-            osProcessUnix.cpp \
-            osThreadUnix.cpp
-
-        $(call emugl-export,LDLIBS,-ldl)
-    endif
-
-    ifeq ($(HOST_OS),linux)
-        $(call emugl-export,LDLIBS,-lpthread -lrt)
-    endif
-
+    LOCAL_SRC_FILES = $(host_common_SRC_FILES)
+    $(call emugl-export,LDLIBS,$(host_common_LDLIBS))
+$(call emugl-end-module)
+
+### 64-bit host library ####
+$(call emugl-begin-host-static-library,lib64OpenglOsUtils)
+    $(call emugl-export,C_INCLUDES,$(LOCAL_PATH))
+    LOCAL_SRC_FILES = $(host_common_SRC_FILES)
+    $(call emugl-export,LDLIBS,$(host_common_LDLIBS))
+    $(call emugl-export,CFLAGS,-m64)
 $(call emugl-end-module)

tools/emulator/opengl/shared/OpenglOsUtils/osDynLibrary.h

@@ -45,4 +45,27 @@ private:
 
 } // of namespace osUtils
 
+
+
+// Macro to compose emugl shared library name under various OS and bitness
+// eg.
+//     on x86_64, EMUGL_LIBNAME("foo") --> "lib64foo.so"
+
+#ifdef _WIN32
+#  define DLL_EXTENSION  "" // _WIN32 LoadLibrary only accept name w/o .dll extension
+#elif defined(__APPLE__)
+#  define DLL_EXTENSION  ".dylib"
+#else
+#  define DLL_EXTENSION  ".so"
+#endif
+
+#if defined(__x86_64__)
+#  define EMUGL_LIBNAME(name) "lib64" name DLL_EXTENSION
+#elif defined(__i386__)
+#  define EMUGL_LIBNAME(name) "lib" name DLL_EXTENSION
+#else
+/* This header is included by target w/o using EMUGL_LIBNAME().  Don't #error, leave it undefined */
+#endif
+
+
 #endif