p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 4379e2b8: Merge "Add LOCAL_MODULE_HOST_OS" 

* commit '4379e2b8bbaf2a02777f189c758e251015eb7f76':
  Add LOCAL_MODULE_HOST_OS
This commit is contained in:
Dan Willemsen 2015-09-04 01:31:22 +00:00 committed by Android Git Automerger
parent b8b535349a 4379e2b8bb
commit f18345af74
4 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/clear_vars.mk
View File

@ -181,6 +181,7 @@ LOCAL_SANITIZE:=
LOCAL_SANITIZE_RECOVER:=
LOCAL_DBUS_PROXY_PREFIX:=
LOCAL_INIT_RC:=
LOCAL_MODULE_HOST_OS:=
# arch specific variables
LOCAL_SRC_FILES_$(TARGET_ARCH):=

13
core/module_arch_supported.mk
View File

@ -8,6 +8,8 @@
## LOCAL_MODULE_$(my_prefix)ARCH_WARN
## LOCAL_MODULE_UNSUPPORTED_$(my_prefix)ARCH
## LOCAL_MODULE_UNSUPPORTED_$(my_prefix)ARCH_WARN
## LOCAL_IS_HOST_MODULE
## LOCAL_MODULE_HOST_OS
##
## Inputs from build system:
## $(my_prefix)IS_64_BIT
@ -58,3 +60,14 @@ ifneq (,$(filter $($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH),$(LOCAL_MODULE_
my_module_arch_supported := false
$(warning $(LOCAL_MODULE): architecture $($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH) unsupported)
endif
ifdef LOCAL_IS_HOST_MODULE
ifneq (,$(LOCAL_MODULE_HOST_OS))
ifeq (,$(filter $($(my_prefix)OS),$(LOCAL_MODULE_HOST_OS)))
my_module_arch_supported := false
endif
else ifeq ($($(my_prefix)OS),windows)
# If LOCAL_MODULE_HOST_OS is empty, only linux and darwin are supported
my_module_arch_supported := false
endif
endif

1
libs/host/Android.mk
View File

@ -7,6 +7,7 @@ LOCAL_SRC_FILES:= \
LOCAL_CFLAGS_darwin += -DMACOSX_RSRC
LOCAL_MODULE:= libhost
LOCAL_MODULE_HOST_OS := darwin linux windows
LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
LOCAL_CXX_STL := none

1
tools/zipalign/Android.mk
View File

@ -33,5 +33,6 @@ LOCAL_LDLIBS += -lpthread
endif # BUILD_HOST_static
LOCAL_MODULE := zipalign
LOCAL_MODULE_HOST_OS := darwin linux windows
include $(BUILD_HOST_EXECUTABLE)