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

Commit 4379e2b8 authored by Dan Willemsen's avatar Dan Willemsen Committed by Gerrit Code Review
Browse files

Merge "Add LOCAL_MODULE_HOST_OS"

parents 62062c9d 859ac340

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -182,6 +182,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):=

core/module_arch_supported.mk

+13 −0
Original line number Diff line number Diff line
@@ -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

libs/host/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -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

tools/zipalign/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -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)