From 632a0e1c92700d8dbe8e4474500db3cc28c571d3 Mon Sep 17 00:00:00 2001 From: Andrew Hsieh Date: Sat, 28 Apr 2012 00:48:53 +0800 Subject: Allow BUILD_HOST_static to build statically-linked emulator Statically linked emulator is easy to setup in sandboxed environment. With this and BUILD_HOST_static in build/ (seperate CL), statically-linked SDK tools can be built with the following command BUILD_HOST_static=1 make PRODUCT-sdk-aapt adb aidl dexdump fastboot \ llvm-rs-cc dmtracedump emulator emulator-arm emulator-x86 \ etc1tool hprof-conv mksdcard sqlite3 zipalign No need to build HW GL libraries (libOpenglRender, libGLES_CM_translator, libGLES_V2_translator and libEGL_translator) because statically-linked emulator doesn't support audio and graphics. (eg. -no-window) Change-Id: I209287a00f66295b8b8135451025428f03776a1a --- Makefile.android | 4 ++++ Makefile.target | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile.android b/Makefile.android index 7b35039..ce5336f 100644 --- a/Makefile.android +++ b/Makefile.android @@ -129,6 +129,10 @@ ifneq ($(combo_target)$(TARGET_SIMULATOR),HOST_true) MY_LDLIBS += -m32 endif endif + + ifneq ($(BUILD_HOST_static),) + MY_LDLIBS += -static + endif endif # Enable warning, except those related to missing field initializers diff --git a/Makefile.target b/Makefile.target index f7122fa..0f22387 100644 --- a/Makefile.target +++ b/Makefile.target @@ -323,7 +323,7 @@ endif # Generate a completely static executable if needed. # Note that this means no sound and graphics on Linux. # -ifeq ($(CONFIG_STATIC_EXECUTABLE),true) +ifneq ($(strip $(CONFIG_STATIC_EXECUTABLE)$(BUILD_HOST_static)),) LOCAL_SRC_FILES += dynlink-static.c LOCAL_LDLIBS += -static endif @@ -409,7 +409,7 @@ common_LOCAL_SRC_FILES += $(SDLMAIN_SOURCES) # Generate a completely static executable if needed. # Note that this means no sound and graphics on Linux. # -ifeq ($(CONFIG_STATIC_EXECUTABLE),true) +ifneq ($(strip $(CONFIG_STATIC_EXECUTABLE)$(BUILD_HOST_static)),) common_LOCAL_SRC_FILES += dynlink-static.c common_LOCAL_LDLIBS += -static endif -- cgit v1.1