From 93f283dba455346499a8b9d1d82b4ce670db5f78 Mon Sep 17 00:00:00 2001
From: Andrew Hsieh <andrewhsieh@google.com>
Date: Tue, 13 Mar 2012 00:55:34 -0700
Subject: [PATCH] Added rules to build f/n/libs/utils in 64-bit: lib64utils.a

It's needed to build four shared libraries in 64-bit for 64-bit
emulator with "-gpu on"
  lib64OpenglRender.so
  lib64EGL_translator.so
  lib64GLES_CM_translator.so
  lib64GLES_V2_translator.so

Change-Id: Ia6c05b23df1e9cd9e7f2e94e4cd5bde4be5d336b
---
 libs/utils/Android.mk | 36 +++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/libs/utils/Android.mk b/libs/utils/Android.mk
index 57c048a3e..87d0fb22c 100644
--- a/libs/utils/Android.mk
+++ b/libs/utils/Android.mk
@@ -43,29 +43,39 @@ commonSources:= \
 	VectorImpl.cpp \
 	misc.cpp
 
-
-# For the host
-# =====================================================
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:= $(commonSources)
-
-LOCAL_MODULE:= libutils
-
-LOCAL_CFLAGS += -DLIBUTILS_NATIVE=1 $(TOOL_CFLAGS)
+host_commonCflags := -DLIBUTILS_NATIVE=1 $(TOOL_CFLAGS)
 
 ifeq ($(HOST_OS),windows)
 ifeq ($(strip $(USE_CYGWIN),),)
 # Under MinGW, ctype.h doesn't need multi-byte support
-LOCAL_CFLAGS += -DMB_CUR_MAX=1
+host_commonCflags += -DMB_CUR_MAX=1
 endif
 endif
 
+host_commonLdlibs :=
+
 ifeq ($(TARGET_OS),linux)
-LOCAL_LDLIBS += -lrt -ldl
+host_commonLdlibs += -lrt -ldl
 endif
 
+
+# For the host
+# =====================================================
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES:= $(commonSources)
+LOCAL_MODULE:= libutils
+LOCAL_CFLAGS += $(host_commonCflags)
+LOCAL_LDLIBS += $(host_commonLdlibs)
+include $(BUILD_HOST_STATIC_LIBRARY)
+
+
+# For the host, 64-bit
+# =====================================================
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES:= $(commonSources)
+LOCAL_MODULE:= lib64utils
+LOCAL_CFLAGS += $(host_commonCflags) -m64
+LOCAL_LDLIBS += $(host_commonLdlibs)
 include $(BUILD_HOST_STATIC_LIBRARY)