diff options
| author | David 'Digit' Turner <digit@google.com> | 2014-02-27 17:47:14 +0100 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2014-03-11 18:03:08 +0100 |
| commit | 829f46fdcd3136e2b97c310538cb27881ff3733b (patch) | |
| tree | 1cfb62caec8f10a683d9ccdb5cabb795be6088ea /emulator/opengl/host/libs | |
| parent | c26879632b8ed3e91c7e5e9e9650d2412835e849 (diff) | |
| download | sdk-829f46fdcd3136e2b97c310538cb27881ff3733b.zip sdk-829f46fdcd3136e2b97c310538cb27881ff3733b.tar.gz sdk-829f46fdcd3136e2b97c310538cb27881ff3733b.tar.bz2 | |
emulator/opengl: Remove libcutils/libutils/liblog
Final patch to completely remove dependencies on
libcutils/libutils/liblog from the host-side GPU
emulation libraries.
Change-Id: I84a058bbd0ca676b18c0b0a094ac8bae692f9c94
Diffstat (limited to 'emulator/opengl/host/libs')
| -rw-r--r-- | emulator/opengl/host/libs/Translator/GLcommon/Android.mk | 4 | ||||
| -rw-r--r-- | emulator/opengl/host/libs/libOpenglRender/Android.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/emulator/opengl/host/libs/Translator/GLcommon/Android.mk b/emulator/opengl/host/libs/Translator/GLcommon/Android.mk index 2c16878..52cbf7c 100644 --- a/emulator/opengl/host/libs/Translator/GLcommon/Android.mk +++ b/emulator/opengl/host/libs/Translator/GLcommon/Android.mk @@ -41,7 +41,7 @@ LOCAL_SRC_FILES := $(host_common_SRC_FILES) $(call emugl-export,LDLIBS,$(host_common_LDLIBS)) $(call emugl-export,LDFLAGS,$(host_common_LDFLAGS)) $(call emugl-export,C_INCLUDES,$(LOCAL_PATH)/../include $(EMUGL_PATH)/shared) -$(call emugl-export,STATIC_LIBRARIES, libemugl_common libutils libcutils liblog) +$(call emugl-export,STATIC_LIBRARIES, libemugl_common) $(call emugl-end-module) @@ -56,6 +56,6 @@ LOCAL_SRC_FILES := $(host_common_SRC_FILES) $(call emugl-export,LDLIBS,$(host_common_LDLIBS)) $(call emugl-export,LDFLAGS,$(host_common_LDFLAGS)) $(call emugl-export,C_INCLUDES,$(LOCAL_PATH)/../include $(EMUGL_PATH)/shared) -$(call emugl-export,STATIC_LIBRARIES, lib64emugl_common lib64utils lib64cutils lib64log) +$(call emugl-export,STATIC_LIBRARIES, lib64emugl_common) $(call emugl-end-module) diff --git a/emulator/opengl/host/libs/libOpenglRender/Android.mk b/emulator/opengl/host/libs/libOpenglRender/Android.mk index 8b8ba79..3b9492f 100644 --- a/emulator/opengl/host/libs/libOpenglRender/Android.mk +++ b/emulator/opengl/host/libs/libOpenglRender/Android.mk @@ -54,7 +54,7 @@ $(call emugl-export,C_INCLUDES,$(LOCAL_PATH)) # use Translator's egl/gles headers LOCAL_C_INCLUDES += $(EMUGL_PATH)/host/libs/Translator/include -LOCAL_STATIC_LIBRARIES += libemugl_common libutils libcutils liblog +LOCAL_STATIC_LIBRARIES += libemugl_common $(call emugl-export,CFLAGS,$(host_common_CFLAGS)) @@ -76,7 +76,7 @@ $(call emugl-export,C_INCLUDES,$(LOCAL_PATH)) # use Translator's egl/gles headers LOCAL_C_INCLUDES += $(EMUGL_PATH)/host/libs/Translator/include -LOCAL_STATIC_LIBRARIES += lib64emugl_common lib64utils lib64cutils lib64log +LOCAL_STATIC_LIBRARIES += lib64emugl_common $(call emugl-export,CFLAGS,$(host_common_CFLAGS) -m64) |