diff options
| author | David 'Digit' Turner <digit@google.com> | 2014-07-09 16:44:39 +0200 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2014-07-09 18:16:17 +0200 |
| commit | d50eea1bfe3883072b4f8dfcb663f0d83c36bab1 (patch) | |
| tree | b8ea40c428b9d4cf3f842ab1c0cbe52a1fcd883c /emulator/opengl/shared/OpenglCodecCommon | |
| parent | 40cc9f9d50e998b0ce965b261ecf4d206a58618e (diff) | |
| download | sdk-d50eea1bfe3883072b4f8dfcb663f0d83c36bab1.zip sdk-d50eea1bfe3883072b4f8dfcb663f0d83c36bab1.tar.gz sdk-d50eea1bfe3883072b4f8dfcb663f0d83c36bab1.tar.bz2 | |
emulator/opengl: Remove out-of-process handling code.
This removes the last pieces of shared/OpenglOsUtils
which were never used since the code in render_api.cpp always
used thread-based rendering, instead of process-based one.
This feature could be re-implemented in the future, if really
desirable.
Change-Id: I551e0f3d6d5a06ff66cb40b007e2b24c295f1dd8
Diffstat (limited to 'emulator/opengl/shared/OpenglCodecCommon')
| -rw-r--r-- | emulator/opengl/shared/OpenglCodecCommon/Android.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/emulator/opengl/shared/OpenglCodecCommon/Android.mk b/emulator/opengl/shared/OpenglCodecCommon/Android.mk index 83090d8..0c3f827 100644 --- a/emulator/opengl/shared/OpenglCodecCommon/Android.mk +++ b/emulator/opengl/shared/OpenglCodecCommon/Android.mk @@ -13,8 +13,11 @@ commonSources := \ host_commonSources := $(commonSources) +host_commonLdLibs := -lstdc++ + ifeq ($(HOST_OS),windows) host_commonSources += Win32PipeStream.cpp + host_commonLdLibs += -lws2_32 -lpsapi else host_commonSources += UnixStream.cpp endif @@ -26,7 +29,7 @@ $(call emugl-begin-host-static-library,libOpenglCodecCommon) LOCAL_SRC_FILES := $(host_commonSources) $(call emugl-import, libemugl_common) $(call emugl-export,C_INCLUDES,$(EMUGL_PATH)/host/include/libOpenglRender $(LOCAL_PATH)) -$(call emugl-export,LDLIBS,-lstdc++) +$(call emugl-export,LDLIBS,$(host_commonLdLibs)) $(call emugl-end-module) @@ -39,6 +42,6 @@ ifdef EMUGL_BUILD_64BITS $(call emugl-import, lib64emugl_common) $(call emugl-export,C_INCLUDES,$(EMUGL_PATH)/host/include/libOpenglRender $(LOCAL_PATH)) $(call emugl-export,CFLAGS,-m64 -fPIC) - $(call emugl-export,LDLIBS,-lstdc++) + $(call emugl-export,LDLIBS,$(host_commonLdLibs)) $(call emugl-end-module) endif |