diff options
| author | 2012-03-13 00:55:34 -0700 | |
|---|---|---|
| committer | 2012-03-22 09:46:46 -0700 | |
| commit | 1f9e749914c7c636bd759da0209e68d5801407ac (patch) | |
| tree | 581ba8b61f9d2d05adc3f7a752952b247dc4a503 /libs/utils | |
| parent | 42c6d163aaf5170ac23a4d1e5baadddd0fb71406 (diff) | |
Added rules to build f/b/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
Diffstat (limited to 'libs/utils')
| -rw-r--r-- | libs/utils/Android.mk | 39 |
1 files changed, 25 insertions, 14 deletions
diff --git a/libs/utils/Android.mk b/libs/utils/Android.mk index 831d9e37890c..79925453acca 100644 --- a/libs/utils/Android.mk +++ b/libs/utils/Android.mk @@ -51,30 +51,41 @@ commonSources:= \ ZipUtils.cpp \ misc.cpp - -# For the host -# ===================================================== - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES:= $(commonSources) - -LOCAL_MODULE:= libutils - -LOCAL_CFLAGS += -DLIBUTILS_NATIVE=1 $(TOOL_CFLAGS) -LOCAL_C_INCLUDES += external/zlib +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) +LOCAL_C_INCLUDES += external/zlib +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) +LOCAL_C_INCLUDES += external/zlib include $(BUILD_HOST_STATIC_LIBRARY) |