From cecb6a0e36bbbf85843b50bb1c9e2f8635e5ffe3 Mon Sep 17 00:00:00 2001 From: David 'Digit' Turner Date: Tue, 23 Aug 2011 16:23:44 +0200 Subject: [PATCH] emulator: opengl: Make host decoder libraries static These libraries are only used by libOpenglRender, so make them static so that their code is included in this shared library instead. This reduces the shared library dependencies that will be required from the emulator. Change-Id: I24438932f0d6b40852b515140ea6950c04124fdd --- tools/emulator/opengl/host/libs/GLESv1_dec/Android.mk | 2 +- tools/emulator/opengl/host/libs/GLESv2_dec/Android.mk | 2 +- tools/emulator/opengl/host/libs/renderControl_dec/Android.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/emulator/opengl/host/libs/GLESv1_dec/Android.mk b/tools/emulator/opengl/host/libs/GLESv1_dec/Android.mk index ba629495f..5f134fc22 100644 --- a/tools/emulator/opengl/host/libs/GLESv1_dec/Android.mk +++ b/tools/emulator/opengl/host/libs/GLESv1_dec/Android.mk @@ -1,6 +1,6 @@ LOCAL_PATH := $(call my-dir) -$(call emugl-begin-host-shared-library,libGLESv1_dec) +$(call emugl-begin-host-static-library,libGLESv1_dec) $(call emugl-import, libOpenglCodecCommon libOpenglOsUtils) $(call emugl-export,C_INCLUDES,$(LOCAL_PATH)) diff --git a/tools/emulator/opengl/host/libs/GLESv2_dec/Android.mk b/tools/emulator/opengl/host/libs/GLESv2_dec/Android.mk index 009d47b00..a66c6ce32 100644 --- a/tools/emulator/opengl/host/libs/GLESv2_dec/Android.mk +++ b/tools/emulator/opengl/host/libs/GLESv2_dec/Android.mk @@ -1,6 +1,6 @@ LOCAL_PATH := $(call my-dir) -$(call emugl-begin-host-shared-library,libGLESv2_dec) +$(call emugl-begin-host-static-library,libGLESv2_dec) $(call emugl-import, libOpenglCodecCommon libOpenglOsUtils) $(call emugl-gen-decoder,$(EMUGL_PATH)/system/GLESv2_enc,gl2) diff --git a/tools/emulator/opengl/host/libs/renderControl_dec/Android.mk b/tools/emulator/opengl/host/libs/renderControl_dec/Android.mk index 889b5dd65..4d07938ae 100644 --- a/tools/emulator/opengl/host/libs/renderControl_dec/Android.mk +++ b/tools/emulator/opengl/host/libs/renderControl_dec/Android.mk @@ -1,6 +1,6 @@ LOCAL_PATH := $(call my-dir) -$(call emugl-begin-host-shared-library,lib_renderControl_dec) +$(call emugl-begin-host-static-library,lib_renderControl_dec) $(call emugl-import,libOpenglCodecCommon) $(call emugl-gen-decoder,$(EMUGL_PATH)/system/renderControl_enc,renderControl) # For renderControl_types.h