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

Merge "changing GLcommon lib to be a sharedlib instead of static"

Browse Source
This commit is contained in:
David Turner
2011-05-16 06:40:07 -07:00
committed by Android Code Review
parent d1ac6bdc3b e387c21109
commit 92c079dfd6
3 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tools/emulator/opengl/host/libs/Translator/EGL/Android.mk
View File

@@ -19,6 +19,7 @@ endif
ifeq ($(HOST_OS),windows) ifeq ($(HOST_OS),windows)
OS_SRCS = EglWindowsApi.cpp OS_SRCS = EglWindowsApi.cpp
LOCAL_LDLIBS := -lopengl32 -lgdi32
endif endif
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
@@ -38,11 +39,21 @@ LOCAL_SRC_FILES := \
LOCAL_C_INCLUDES += \ LOCAL_C_INCLUDES += \
$(translator_path)/include $(translator_path)/include \
$(translator_path)/../../../shared
LOCAL_CFLAGS := -g -O0 LOCAL_CFLAGS := -g -O0
LOCAL_MODULE_TAGS := debug LOCAL_MODULE_TAGS := debug
LOCAL_MODULE := libEGL_translator LOCAL_MODULE := libEGL_translator
LOCAL_STATIC_LIBRARIES := libGLcommon libcutils
LOCAL_STATIC_LIBRARIES := \
libcutils \
libutils \
liblog \
libOpenglOsUtils
LOCAL_SHARED_LIBRARIES := \
libGLcommon
include $(BUILD_HOST_SHARED_LIBRARY) include $(BUILD_HOST_SHARED_LIBRARY)

18
tools/emulator/opengl/host/libs/Translator/GLES_CM/Android.mk
View File

@@ -19,16 +19,28 @@ LOCAL_SRC_FILES := \
RangeManip.cpp RangeManip.cpp
LOCAL_C_INCLUDES += \ LOCAL_C_INCLUDES += \
$(translator_path)/include $(translator_path)/include \
$(translator_path)/../../../shared
LOCAL_STATIC_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := \
libGLcommon \ libOpenglOsUtils \
libutils \
libcutils libcutils
LOCAL_SHARED_LIBRARIES := \
libGLcommon
LOCAL_CFLAGS := -g -O0 LOCAL_CFLAGS := -g -O0
LOCAL_MODULE_TAGS := debug LOCAL_MODULE_TAGS := debug
LOCAL_MODULE := libGLES_CM_translator LOCAL_MODULE := libGLES_CM_translator
LOCAL_LDLIBS := -lGL
ifeq ($(HOST_OS),linux)
LOCAL_LDLIBS := -lGL -ldl
endif
ifeq ($(HOST_OS),windows)
LOCAL_LDLIBS := -lopengl32 -lgdi32
endif
include $(BUILD_HOST_SHARED_LIBRARY) include $(BUILD_HOST_SHARED_LIBRARY)

9
tools/emulator/opengl/host/libs/Translator/GLcommon/Android.mk
View File

@@ -14,8 +14,15 @@ LOCAL_SRC_FILES := \
LOCAL_C_INCLUDES += \ LOCAL_C_INCLUDES += \
$(translator_path)/include $(translator_path)/include
LOCAL_STATIC_LIBRARIES := \
libutils \
libcutils
LOCAL_CFLAGS := -g -O0 LOCAL_CFLAGS := -g -O0
LOCAL_MODULE_TAGS := debug LOCAL_MODULE_TAGS := debug
LOCAL_MODULE := libGLcommon LOCAL_MODULE := libGLcommon
ifeq ($(HOST_OS),linux)
LOCAL_LDFLAGS := -Wl,--whole-archive
endif
include $(BUILD_HOST_STATIC_LIBRARY) include $(BUILD_HOST_SHARED_LIBRARY)