Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d69e06b authored Aug 21, 2012 by Andrew Hsieh Committed by android code review Aug 21, 2012

Merge "Added BUILD_HOST_static to build statically linked executable/shared-lib"

parents 45cd00cd 31ef1037

core/combo/HOST_darwin-x86.mk

+5 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,11 @@ HOST_GLOBAL_CFLAGS += -m32
		HOST_GLOBAL_LDFLAGS += -m32
		endif # BUILD_HOST_64bit

		ifneq ($(strip $(BUILD_HOST_static)),)
		# Statically-linked binaries are desirable for sandboxed environment
		HOST_GLOBAL_LDFLAGS += -static
		endif # BUILD_HOST_static

		build_mac_version := $(shell sw_vers -productVersion)
		mac_sdk_version := 10.6
		mac_sdk_root := /Developer/SDKs/MacOSX$(mac_sdk_version).sdk

core/combo/HOST_linux-x86.mk

+5 −0

Original line number	Diff line number	Diff line
		@@ -52,6 +52,11 @@ HOST_GLOBAL_CFLAGS += -m32
		HOST_GLOBAL_LDFLAGS += -m32
		endif # BUILD_HOST_64bit

		ifneq ($(strip $(BUILD_HOST_static)),)
		# Statically-linked binaries are desirable for sandboxed environment
		HOST_GLOBAL_LDFLAGS += -static
		endif # BUILD_HOST_static

		HOST_GLOBAL_CFLAGS += -fPIC
		HOST_GLOBAL_CFLAGS += \
		-include $(call select-android-config-h,linux-x86)

core/combo/HOST_windows-x86.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -46,6 +46,10 @@ HOST_AR := $(TOOLS_PREFIX)ar$(TOOLS_EXE_SUFFIX)

		HOST_GLOBAL_CFLAGS += -include $(call select-android-config-h,windows)
		HOST_GLOBAL_LDFLAGS += --enable-stdcall-fixup
		ifneq ($(strip $(BUILD_HOST_static)),)
		# Statically-linked binaries are desirable for sandboxed environment
		HOST_GLOBAL_LDFLAGS += -static
		endif # BUILD_HOST_static

		# when building under Cygwin, ensure that we use Mingw compilation by default.
		# you can disable this (i.e. to generate Cygwin executables) by defining the

tools/zipalign/Android.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,10 @@ else
		LOCAL_LDLIBS += -lz
		endif

		ifneq ($(strip $(BUILD_HOST_static)),)
		LOCAL_LDLIBS += -lpthread
		endif # BUILD_HOST_static

		LOCAL_MODULE := zipalign

		include $(BUILD_HOST_EXECUTABLE)