LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 76780669: Added rules to build 64-bit libraries for 64-bit emulator

Browse Source 
* commit '76780669f9867587693563358ccdc903e9cdcbba':
  Added rules to build 64-bit libraries for 64-bit emulator
This commit is contained in:
Andrew Hsieh
2012-03-22 13:27:43 -07:00
committed by Android Git Automerger
parent 40b67a0eb0 76780669f9
commit 9e3e95f65f
15 changed files with 291 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
tools/emulator/opengl/shared/OpenglCodecCommon/Android.mk
View File

@@ -11,6 +11,15 @@ commonSources := \
TcpStream.cpp \
TimeUtils.cpp
host_commonSources := $(commonSources)
ifeq ($(HOST_OS),windows)
host_commonSources += Win32PipeStream.cpp
else
host_commonSources += UnixStream.cpp
endif
### CodecCommon guest ##############################################
$(call emugl-begin-static-library,libOpenglCodecCommon)
@@ -22,18 +31,24 @@ $(call emugl-export,SHARED_LIBRARIES,libcutils libutils)
$(call emugl-export,C_INCLUDES,$(LOCAL_PATH))
$(call emugl-end-module)
### OpenglCodecCommon host ##############################################
$(call emugl-begin-host-static-library,libOpenglCodecCommon)
LOCAL_SRC_FILES := $(commonSources)
ifeq ($(HOST_OS),windows)
LOCAL_SRC_FILES += Win32PipeStream.cpp
else
LOCAL_SRC_FILES += UnixStream.cpp
endif
LOCAL_SRC_FILES := $(host_commonSources)
$(call emugl-export,STATIC_LIBRARIES,libcutils)
$(call emugl-export,C_INCLUDES,$(LOCAL_PATH))
$(call emugl-end-module)
### OpenglCodecCommon host, 64-bit #########################################
$(call emugl-begin-host-static-library,lib64OpenglCodecCommon)
LOCAL_SRC_FILES := $(host_commonSources)
$(call emugl-export,STATIC_LIBRARIES,lib64cutils)
$(call emugl-export,C_INCLUDES,$(LOCAL_PATH))
$(call emugl-export,CFLAGS,-m64)
$(call emugl-end-module)

53
tools/emulator/opengl/shared/OpenglOsUtils/Android.mk
View File

@@ -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)

23
tools/emulator/opengl/shared/OpenglOsUtils/osDynLibrary.h
View File

@@ -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