tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Add LOCAL_MODULE_HOST_OS"

Browse source
This commit is contained in:
Dan Willemsen 2015-09-04 01:24:15 +00:00 committed by Gerrit Code Review
commit 4379e2b8bb
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

@ -182,6 +182,7 @@ LOCAL_SANITIZE:=
LOCAL_SANITIZE_RECOVER:= LOCAL_SANITIZE_RECOVER:=
LOCAL_DBUS_PROXY_PREFIX:= LOCAL_DBUS_PROXY_PREFIX:=
LOCAL_INIT_RC:= LOCAL_INIT_RC:=
LOCAL_MODULE_HOST_OS:=
# arch specific variables # arch specific variables
LOCAL_SRC_FILES_$(TARGET_ARCH):= 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_$(my_prefix)ARCH_WARN
## LOCAL_MODULE_UNSUPPORTED_$(my_prefix)ARCH ## LOCAL_MODULE_UNSUPPORTED_$(my_prefix)ARCH
## LOCAL_MODULE_UNSUPPORTED_$(my_prefix)ARCH_WARN ## LOCAL_MODULE_UNSUPPORTED_$(my_prefix)ARCH_WARN
## LOCAL_IS_HOST_MODULE
## LOCAL_MODULE_HOST_OS
## ##
## Inputs from build system: ## Inputs from build system:
## $(my_prefix)IS_64_BIT ## $(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 my_module_arch_supported := false
$(warning $(LOCAL_MODULE): architecture $($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH) unsupported) $(warning $(LOCAL_MODULE): architecture $($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH) unsupported)
endif 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_CFLAGS_darwin += -DMACOSX_RSRC
LOCAL_MODULE:= libhost LOCAL_MODULE:= libhost
LOCAL_MODULE_HOST_OS := darwin linux windows
LOCAL_C_INCLUDES := $(LOCAL_PATH)/include LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
LOCAL_CXX_STL := none LOCAL_CXX_STL := none

1
tools/zipalign/Android.mk
View file

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