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

am a1ac4736: am b110da5f: am 9d8854e3: Merge "build: delete 64-bit blacklist"

Browse Source 
* commit 'a1ac47367636c0473156679f8f30af626df7da85':
  build: delete 64-bit blacklist
This commit is contained in:
Colin Cross
2014-06-18 21:40:27 +00:00
committed by Android Git Automerger
parent 69c27d9ad9 a1ac473676
commit bf2f0c729b
4 changed files with 1 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/64_bit_blacklist.mk
View File

@@ -1,16 +0,0 @@
ifneq ($(TARGET_2ND_ARCH),)
# misc build errors
_64_bit_directory_blacklist += \
device/generic/goldfish/opengl \
device/generic/goldfish/camera \
_64_bit_directory_blacklist_pattern := $(addsuffix %,$(_64_bit_directory_blacklist))
define directory_is_64_bit_blacklisted
$(if $(filter $(_64_bit_directory_blacklist_pattern),$(1)),true)
endef
else
define directory_is_64_bit_blacklisted
endef
endif

2
core/definitions.mk
View File

@@ -424,7 +424,7 @@ $(strip \
$(if $(_idfName),, \ $(if $(_idfName),, \
$(error $(LOCAL_PATH): Name not defined in call to intermediates-dir-for)) \ $(error $(LOCAL_PATH): Name not defined in call to intermediates-dir-for)) \
$(eval _idfPrefix := $(if $(strip $(3)),HOST,TARGET)) \ $(eval _idfPrefix := $(if $(strip $(3)),HOST,TARGET)) \
$(eval _idf2ndArchPrefix := $(if $(call directory_is_64_bit_blacklisted,$(LOCAL_PATH))$(strip $(5)),$(TARGET_2ND_ARCH_VAR_PREFIX))) \ $(eval _idf2ndArchPrefix := $(if $(strip $(5)),$(TARGET_2ND_ARCH_VAR_PREFIX))) \
$(if $(filter $(_idfPrefix)-$(_idfClass),$(COMMON_MODULE_CLASSES))$(4), \ $(if $(filter $(_idfPrefix)-$(_idfClass),$(COMMON_MODULE_CLASSES))$(4), \
$(eval _idfIntBase := $($(_idfPrefix)_OUT_COMMON_INTERMEDIATES)) \ $(eval _idfIntBase := $($(_idfPrefix)_OUT_COMMON_INTERMEDIATES)) \
,$(if $(filter $(_idfClass),SHARED_LIBRARIES STATIC_LIBRARIES EXECUTABLES GYP),\ ,$(if $(filter $(_idfClass),SHARED_LIBRARIES STATIC_LIBRARIES EXECUTABLES GYP),\

2
core/main.mk
View File

@@ -92,8 +92,6 @@ include $(BUILD_SYSTEM)/help.mk
# and host information. # and host information.
include $(BUILD_SYSTEM)/config.mk include $(BUILD_SYSTEM)/config.mk
include $(BUILD_SYSTEM)/64_bit_blacklist.mk
# This allows us to force a clean build - included after the config.mk # This allows us to force a clean build - included after the config.mk
# environment setup is done, but before we generate any dependencies. This # environment setup is done, but before we generate any dependencies. This
# file does the rm -rf inline so the deps which are all done below will # file does the rm -rf inline so the deps which are all done below will

2
core/module_arch_supported.mk
View File

@@ -28,8 +28,6 @@ ifeq ($($(my_prefix)IS_64_BIT)|$(my_module_multilib),true|32)
my_module_arch_supported := false my_module_arch_supported := false
else ifeq ($($(my_prefix)IS_64_BIT)|$(my_module_multilib),|64) else ifeq ($($(my_prefix)IS_64_BIT)|$(my_module_multilib),|64)
my_module_arch_supported := false my_module_arch_supported := false
else ifeq ($(call directory_is_64_bit_blacklisted,$(LOCAL_PATH)),true)
my_module_arch_supported := false
endif endif
else # LOCAL_2ND_ARCH_VAR_PREFIX else # LOCAL_2ND_ARCH_VAR_PREFIX
ifeq ($(my_module_multilib),first) ifeq ($(my_module_multilib),first)