StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am b2ce04b4: Merge "Make Windows a non-multilib target."

Browse Source 
* commit 'b2ce04b4317331903b6ec325ea473f5fc5c8aca3':
  Make Windows a non-multilib target.
This commit is contained in:
Dan Albert
2015-05-05 23:53:35 +00:00
committed by Android Git Automerger
parent 7cfccda659 b2ce04b431
commit 174bb3678d
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/envsetup.mk
View File

@@ -255,6 +255,7 @@ $(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_INTERMEDIATES := $(HOST_OUT)/obj32
$(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_INTERMEDIATE_LIBRARIES := $($(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_INTERMEDIATES)/lib $(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_INTERMEDIATE_LIBRARIES := $($(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_INTERMEDIATES)/lib
$(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_SHARED_LIBRARIES := $(HOST_OUT)/lib $(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_SHARED_LIBRARIES := $(HOST_OUT)/lib
$(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_EXECUTABLES := $(HOST_OUT_EXECUTABLES) $(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_EXECUTABLES := $(HOST_OUT_EXECUTABLES)
$(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_JAVA_LIBRARIES := $(HOST_OUT_JAVA_LIBRARIES)
# The default host library path. # The default host library path.
# It always points to the path where we build libraries in the default bitness. # It always points to the path where we build libraries in the default bitness.

8
core/multilib.mk
View File

@@ -13,3 +13,11 @@ ifeq (,$(filter 32 64 first both none,$(my_module_multilib)))
$(error $(LOCAL_PATH): Invalid LOCAL_MULTILIB specified for module $(LOCAL_MODULE)) $(error $(LOCAL_PATH): Invalid LOCAL_MULTILIB specified for module $(LOCAL_MODULE))
endif endif
endif # my_module_multilib defined endif # my_module_multilib defined
# Windows is a special case. Linux and Darwin are both multilib builds, but we
# don't have a 64-bit Windows build, so make sure it's not a multilib build.
ifdef LOCAL_IS_HOST_MODULE
ifeq ($(HOST_OS),windows)
my_module_multilib := 32
endif
endif