diff options
| author | David 'Digit' Turner <digit@google.com> | 2014-07-21 16:22:38 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-07-21 16:22:38 +0000 |
| commit | c245592b0d472437ade15a22076c2193441f0eea (patch) | |
| tree | 889f16f76567054ea5fc085f274ceade0a09bd81 /emulator/opengl/shared/OpenglOsUtils/Android.mk | |
| parent | 245fae139423eb268ecb3eaa06f6ce8c7044c4f4 (diff) | |
| parent | 4e4233679d4ef4e25d13fe3b56bd8cdaa3b822cc (diff) | |
| download | sdk-c245592b0d472437ade15a22076c2193441f0eea.zip sdk-c245592b0d472437ade15a22076c2193441f0eea.tar.gz sdk-c245592b0d472437ade15a22076c2193441f0eea.tar.bz2 | |
Merge changes I551e0f3d,I26d84cf5,I27c993d1 into idea133
automerge: 4e42336
* commit '4e4233679d4ef4e25d13fe3b56bd8cdaa3b822cc':
emulator/opengl: Remove out-of-process handling code.
emulator/opengl: refactor Thread class.
emulator/opengl: refactor shared library handling.
Diffstat (limited to 'emulator/opengl/shared/OpenglOsUtils/Android.mk')
| -rw-r--r-- | emulator/opengl/shared/OpenglOsUtils/Android.mk | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/emulator/opengl/shared/OpenglOsUtils/Android.mk b/emulator/opengl/shared/OpenglOsUtils/Android.mk deleted file mode 100644 index f9673fc..0000000 --- a/emulator/opengl/shared/OpenglOsUtils/Android.mk +++ /dev/null @@ -1,48 +0,0 @@ -# This build script corresponds to a small library containing -# OS-specific support functions for: -# - thread-local storage -# - dynamic library loading -# - child process creation and wait (probably not needed in guest) -# -LOCAL_PATH := $(call my-dir) - -### Host library ############################################## - -host_common_SRC_FILES := osDynLibrary.cpp -host_common_LDLIBS := -host_common_INCLUDES := $(LOCAL_PATH) - -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 -lX11 -endif - -### 32-bit host library #### -$(call emugl-begin-host-static-library,libOpenglOsUtils) - $(call emugl-export,C_INCLUDES,$(host_common_INCLUDES)) - LOCAL_SRC_FILES = $(host_common_SRC_FILES) - $(call emugl-export,LDLIBS,$(host_common_LDLIBS)) - $(call emugl-import,libemugl_common) -$(call emugl-end-module) - -### 64-bit host library #### -ifdef EMUGL_BUILD_64BITS - $(call emugl-begin-host64-static-library,lib64OpenglOsUtils) - $(call emugl-export,C_INCLUDES,$(host_common_INCLUDES)) - LOCAL_SRC_FILES = $(host_common_SRC_FILES) - $(call emugl-export,LDLIBS,$(host_common_LDLIBS)) - $(call emugl-import,lib64emugl_common) - $(call emugl-export,CFLAGS,-m64 -fPIC) - $(call emugl-end-module) -endif |