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

Commit 057aaea5 authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Add HOST_CROSS_OS 

Instead of using recursive make to change the HOST_OS when building the
windows SDK under linux, add the concept of cross-building to another
host os.

Bug: 23566667
Change-Id: I6dc525b601b6251d458d197c30bf4660d7485502
parent 4379e2b8

core/base_rules.mk

+22 −3
Original line number Diff line number Diff line
@@ -34,14 +34,27 @@ ifdef LOCAL_IS_HOST_MODULE 
  ifneq ($(LOCAL_IS_HOST_MODULE),true)

    $(error $(LOCAL_PATH): LOCAL_IS_HOST_MODULE must be "true" or empty, not "$(LOCAL_IS_HOST_MODULE)")

  endif

  ifeq ($(LOCAL_HOST_PREFIX),)

    my_prefix := HOST_

  else

    my_prefix := $(LOCAL_HOST_PREFIX)

  endif

  my_host := host-

else

  my_prefix := TARGET_

  my_host :=

endif



ifeq ($(my_prefix),HOST_CROSS_)

  my_host_cross := true

else

  my_host_cross :=

endif



my_module_tags := $(LOCAL_MODULE_TAGS)

ifeq ($(my_host_cross),true)

  my_module_tags :=

endif



###########################################################

## Validate and define fallbacks for input LOCAL_* variables.
@@ -150,15 +163,18 @@ ifndef LOCAL_NO_2ND_ARCH_MODULE_SUFFIX 
my_register_name := $(LOCAL_MODULE)$($(my_prefix)2ND_ARCH_MODULE_SUFFIX)

endif

endif

ifeq ($(my_host_cross),true)

  my_register_name := host_cross_$(LOCAL_MODULE)

endif

# Make sure that this IS_HOST/CLASS/MODULE combination is unique.

module_id := MODULE.$(if \

    $(LOCAL_IS_HOST_MODULE),HOST,TARGET).$(LOCAL_MODULE_CLASS).$(my_register_name)

    $(LOCAL_IS_HOST_MODULE),$($(my_prefix)OS),TARGET).$(LOCAL_MODULE_CLASS).$(my_register_name)

ifdef $(module_id)

$(error $(LOCAL_PATH): $(module_id) already defined by $($(module_id)))

endif

$(module_id) := $(LOCAL_PATH)



intermediates := $(call local-intermediates-dir,,$(LOCAL_2ND_ARCH_VAR_PREFIX))

intermediates := $(call local-intermediates-dir,,$(LOCAL_2ND_ARCH_VAR_PREFIX),$(my_host_cross))

intermediates.COMMON := $(call local-intermediates-dir,COMMON)

generated_sources_dir := $(call local-generated-sources-dir)
@@ -214,6 +230,8 @@ $(cleantarget):: 
$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_PATH:=$(LOCAL_PATH)

$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_IS_HOST_MODULE := $(LOCAL_IS_HOST_MODULE)

$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_HOST:= $(my_host)

$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_PREFIX := $(my_prefix)



$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_INTERMEDIATES_DIR:= $(intermediates)

$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_2ND_ARCH_VAR_PREFIX := $(LOCAL_2ND_ARCH_VAR_PREFIX)
@@ -345,6 +363,7 @@ endif 
ifdef LOCAL_2ND_ARCH_VAR_PREFIX

ALL_MODULES.$(my_register_name).FOR_2ND_ARCH := true

endif

ALL_MODULES.$(my_register_name).FOR_HOST_CROSS := $(my_host_cross)



INSTALLABLE_FILES.$(LOCAL_INSTALLED_MODULE).MODULE := $(my_register_name)

core/binary.mk

+16 −16
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ endif 
# MinGW spits out warnings about -fPIC even for -fpie?!) being ignored because

# all code is position independent, and then those warnings get promoted to

# errors.

ifndef USE_MINGW

ifneq ($($(my_prefix)OS),windows)

ifeq ($(LOCAL_MODULE_CLASS),EXECUTABLES)

my_cflags += -fpie

else
@@ -186,7 +186,7 @@ endif 
# clang is enabled by default for host builds

# enable it unless we've specifically disabled clang above

ifdef LOCAL_IS_HOST_MODULE

    ifneq ($(HOST_OS),windows)

    ifneq ($($(my_prefix)OS),windows)

    ifeq ($(my_clang),)

        my_clang := true

    endif
@@ -307,17 +307,17 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_GLOBAL_LDFLAGS := $(my_target_glob 
else # LOCAL_IS_HOST_MODULE



ifeq ($(my_clang),true)

my_host_global_cflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_HOST_GLOBAL_CFLAGS)

my_host_global_conlyflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_HOST_GLOBAL_CONLYFLAGS)

my_host_global_cppflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_HOST_GLOBAL_CPPFLAGS)

my_host_global_ldflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_HOST_GLOBAL_LDFLAGS)

my_host_c_includes := $($(LOCAL_2ND_ARCH_VAR_PREFIX)HOST_C_INCLUDES)

my_host_global_cflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_$(my_prefix)GLOBAL_CFLAGS)

my_host_global_conlyflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_$(my_prefix)GLOBAL_CONLYFLAGS)

my_host_global_cppflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_$(my_prefix)GLOBAL_CPPFLAGS)

my_host_global_ldflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_$(my_prefix)GLOBAL_LDFLAGS)

my_host_c_includes := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)C_INCLUDES)

else

my_host_global_cflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)HOST_GLOBAL_CFLAGS)

my_host_global_conlyflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)HOST_GLOBAL_CONLYFLAGS)

my_host_global_cppflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)HOST_GLOBAL_CPPFLAGS)

my_host_global_ldflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)HOST_GLOBAL_LDFLAGS)

my_host_c_includes := $($(LOCAL_2ND_ARCH_VAR_PREFIX)HOST_C_INCLUDES)

my_host_global_cflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)GLOBAL_CFLAGS)

my_host_global_conlyflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)GLOBAL_CONLYFLAGS)

my_host_global_cppflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)GLOBAL_CPPFLAGS)

my_host_global_ldflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)GLOBAL_LDFLAGS)

my_host_c_includes := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)C_INCLUDES)

endif # my_clang



$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_HOST_C_INCLUDES := $(my_host_c_includes)
@@ -1015,9 +1015,9 @@ endif 
import_includes := $(intermediates)/import_includes

import_includes_deps := $(strip \

    $(foreach l, $(installed_shared_library_module_names), \

      $(call intermediates-dir-for,SHARED_LIBRARIES,$(l),$(LOCAL_IS_HOST_MODULE),,$(LOCAL_2ND_ARCH_VAR_PREFIX))/export_includes) \

      $(call intermediates-dir-for,SHARED_LIBRARIES,$(l),$(LOCAL_IS_HOST_MODULE),,$(LOCAL_2ND_ARCH_VAR_PREFIX),$(my_host_cross))/export_includes) \

    $(foreach l, $(my_static_libraries) $(my_whole_static_libraries), \

      $(call intermediates-dir-for,STATIC_LIBRARIES,$(l),$(LOCAL_IS_HOST_MODULE),,$(LOCAL_2ND_ARCH_VAR_PREFIX))/export_includes))

      $(call intermediates-dir-for,STATIC_LIBRARIES,$(l),$(LOCAL_IS_HOST_MODULE),,$(LOCAL_2ND_ARCH_VAR_PREFIX),$(my_host_cross))/export_includes))

$(import_includes): PRIVATE_IMPORT_EXPORT_INCLUDES := $(import_includes_deps)

$(import_includes) : $(LOCAL_MODULE_MAKEFILE) $(import_includes_deps)

	@echo Import includes file: $@
@@ -1122,7 +1122,7 @@ endif 
built_static_libraries := \

    $(foreach lib,$(my_static_libraries), \

      $(call intermediates-dir-for, \

        STATIC_LIBRARIES,$(lib),$(LOCAL_IS_HOST_MODULE),,$(LOCAL_2ND_ARCH_VAR_PREFIX))/$(lib)$(a_suffix))

        STATIC_LIBRARIES,$(lib),$(LOCAL_IS_HOST_MODULE),,$(LOCAL_2ND_ARCH_VAR_PREFIX),$(my_host_cross))/$(lib)$(a_suffix))



ifdef LOCAL_SDK_VERSION

built_static_libraries += $(my_ndk_stl_static_lib)
@@ -1131,7 +1131,7 @@ endif 
built_whole_libraries := \

    $(foreach lib,$(my_whole_static_libraries), \

      $(call intermediates-dir-for, \

        STATIC_LIBRARIES,$(lib),$(LOCAL_IS_HOST_MODULE),,$(LOCAL_2ND_ARCH_VAR_PREFIX))/$(lib)$(a_suffix))

        STATIC_LIBRARIES,$(lib),$(LOCAL_IS_HOST_MODULE),,$(LOCAL_2ND_ARCH_VAR_PREFIX),$(my_host_cross))/$(lib)$(a_suffix))



# We don't care about installed static libraries, since the

# libraries have already been linked into the module at that point.

core/ccache.mk

+0 −5
Original line number Diff line number Diff line
@@ -37,11 +37,6 @@ ifneq ($(USE_CCACHE),) 
  export CCACHE_CPP2 := true



  CCACHE_HOST_TAG := $(HOST_PREBUILT_TAG)

  # If we are cross-compiling Windows binaries on Linux

  # then use the linux ccache binary instead.

  ifeq ($(HOST_OS)-$(BUILD_OS),windows-linux)

    CCACHE_HOST_TAG := linux-$(HOST_PREBUILT_ARCH)

  endif

  ccache := prebuilts/misc/$(CCACHE_HOST_TAG)/ccache/ccache

  # Check that the executable is here.

  ccache := $(strip $(wildcard $(ccache)))

core/clang/HOST_CROSS_windows.mk

0 → 100644
+56 −0
Original line number Diff line number Diff line 


include $(BUILD_SYSTEM)/clang/x86.mk



CLANG_CONFIG_x86_HOST_CROSS_TRIPLE := i686-pc-mingw32



CLANG_CONFIG_x86_HOST_CROSS_EXTRA_ASFLAGS := \

  $(CLANG_CONFIG_EXTRA_ASFLAGS) \

  $(CLANG_CONFIG_HOST_CROSS_EXTRA_ASFLAGS) \

  $(CLANG_CONFIG_x86_EXTRA_ASFLAGS) \

  $(CLANG_CONFIG_x86_HOST_CROSS_COMBO_EXTRA_ASFLAGS) \

  -target $(CLANG_CONFIG_x86_HOST_CROSS_TRIPLE)



CLANG_CONFIG_x86_HOST_CROSS_EXTRA_CFLAGS := \

  $(CLANG_CONFIG_EXTRA_CFLAGS) \

  $(CLANG_CONFIG_HOST_CROSS_EXTRA_CFLAGS) \

  $(CLANG_CONFIG_x86_EXTRA_CFLAGS) \

  $(CLANG_CONFIG_x86_HOST_CROSS_COMBO_EXTRA_CFLAGS) \

  $(CLANG_CONFIG_x86_HOST_CROSS_EXTRA_ASFLAGS)



CLANG_CONFIG_x86_HOST_CROSS_EXTRA_CONLYFLAGS := \

  $(CLANG_CONFIG_EXTRA_CONLYFLAGS) \

  $(CLANG_CONFIG_HOST_CROSS_EXTRA_CONLYFLAGS) \

  $(CLANG_CONFIG_x86_EXTRA_CONLYFLAGS) \

  $(CLANG_CONFIG_x86_HOST_CROSS_COMBO_EXTRA_CONLYFLAGS)



CLANG_CONFIG_x86_HOST_CROSS_EXTRA_CPPFLAGS := \

  $(CLANG_CONFIG_EXTRA_CPPFLAGS) \

  $(CLANG_CONFIG_HOST_CROSS_EXTRA_CPPFLAGS) \

  $(CLANG_CONFIG_x86_EXTRA_CPPFLAGS) \

  $(CLANG_CONFIG_x86_HOST_CROSS_COMBO_EXTRA_CPPFLAGS) \

  -target $(CLANG_CONFIG_x86_HOST_CROSS_TRIPLE)



CLANG_CONFIG_x86_HOST_CROSS_EXTRA_LDFLAGS := \

  $(CLANG_CONFIG_EXTRA_LDFLAGS) \

  $(CLANG_CONFIG_HOST_CROSS_EXTRA_LDFLAGS) \

  $(CLANG_CONFIG_x86_EXTRA_LDFLAGS) \

  $(CLANG_CONFIG_x86_HOST_CROSS_COMBO_EXTRA_LDFLAGS) \

  -target $(CLANG_CONFIG_x86_HOST_CROSS_TRIPLE)



CLANG_HOST_CROSS_GLOBAL_CFLAGS := \

  $(call convert-to-host-clang-flags,$(HOST_CROSS_GLOBAL_CFLAGS)) \

  $(CLANG_CONFIG_x86_HOST_CROSS_EXTRA_CFLAGS)



CLANG_HOST_CROSS_GLOBAL_CONLYFLAGS := \

  $(call convert-to-host-clang-flags,$(HOST_CROSS_GLOBAL_CONLYFLAGS)) \

  $(CLANG_CONFIG_x86_HOST_CROSS_EXTRA_CONLYFLAGS)



CLANG_HOST_CROSS_GLOBAL_CPPFLAGS := \

  $(call convert-to-host-clang-flags,$(HOST_CROSS_GLOBAL_CPPFLAGS)) \

  $(CLANG_CONFIG_x86_HOST_CROSS_EXTRA_CPPFLAGS)



CLANG_HOST_CROSS_GLOBAL_LDFLAGS := \

  $(call convert-to-host-clang-flags,$(HOST_CROSS_GLOBAL_LDFLAGS)) \

  $(CLANG_CONFIG_x86_HOST_CROSS_EXTRA_LDFLAGS)



HOST_CROSS_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-i686.a

core/clang/HOST_x86.mk

+0 −3
Original line number Diff line number Diff line
@@ -16,9 +16,6 @@ CLANG_CONFIG_x86_HOST_COMBO_EXTRA_CFLAGS := $(CLANG_CONFIG_x86_DARWIN_HOST_EXTRA 
CLANG_CONFIG_x86_HOST_COMBO_EXTRA_CPPFLAGS := $(CLANG_CONFIG_x86_DARWIN_HOST_EXTRA_CPPFLAGS)

CLANG_CONFIG_x86_HOST_COMBO_EXTRA_LDFLAGS := $(CLANG_CONFIG_x86_DARWIN_HOST_EXTRA_LDFLAGS)

endif

ifeq ($(HOST_OS),windows)

CLANG_CONFIG_x86_HOST_TRIPLE := i686-pc-mingw32

endif



CLANG_CONFIG_x86_HOST_EXTRA_ASFLAGS := \

  $(CLANG_CONFIG_EXTRA_ASFLAGS) \