diff options
| author | Colin Cross <ccross@android.com> | 2014-06-18 20:17:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-06-17 21:42:00 +0000 |
| commit | 9d8854e30c93ae9c635ae37c4825ff2c3bfb0f44 (patch) | |
| tree | acbc86b808d556f68d56625e69b885023eb114fe /core | |
| parent | c426298280cea52af693ce76fe8643012ebe54b2 (diff) | |
| parent | ae2986e51a52833deac6c03f55924e3271e3586d (diff) | |
| download | build-9d8854e30c93ae9c635ae37c4825ff2c3bfb0f44.zip build-9d8854e30c93ae9c635ae37c4825ff2c3bfb0f44.tar.gz build-9d8854e30c93ae9c635ae37c4825ff2c3bfb0f44.tar.bz2 | |
Merge "build: delete 64-bit blacklist"
Diffstat (limited to 'core')
| -rw-r--r-- | core/64_bit_blacklist.mk | 16 | ||||
| -rw-r--r-- | core/definitions.mk | 2 | ||||
| -rw-r--r-- | core/main.mk | 2 | ||||
| -rw-r--r-- | core/module_arch_supported.mk | 2 |
4 files changed, 1 insertions, 21 deletions
diff --git a/core/64_bit_blacklist.mk b/core/64_bit_blacklist.mk deleted file mode 100644 index b7420cd..0000000 --- a/core/64_bit_blacklist.mk +++ /dev/null @@ -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 diff --git a/core/definitions.mk b/core/definitions.mk index 9260345..c2c8823 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -424,7 +424,7 @@ $(strip \ $(if $(_idfName),, \ $(error $(LOCAL_PATH): Name not defined in call to intermediates-dir-for)) \ $(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), \ $(eval _idfIntBase := $($(_idfPrefix)_OUT_COMMON_INTERMEDIATES)) \ ,$(if $(filter $(_idfClass),SHARED_LIBRARIES STATIC_LIBRARIES EXECUTABLES GYP),\ diff --git a/core/main.mk b/core/main.mk index 15b4cbc..9f341b9 100644 --- a/core/main.mk +++ b/core/main.mk @@ -92,8 +92,6 @@ include $(BUILD_SYSTEM)/help.mk # and host information. 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 # 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 diff --git a/core/module_arch_supported.mk b/core/module_arch_supported.mk index 15fd648..a5e4a7c 100644 --- a/core/module_arch_supported.mk +++ b/core/module_arch_supported.mk @@ -28,8 +28,6 @@ ifeq ($($(my_prefix)IS_64_BIT)|$(my_module_multilib),true|32) my_module_arch_supported := false else ifeq ($($(my_prefix)IS_64_BIT)|$(my_module_multilib),|64) my_module_arch_supported := false -else ifeq ($(call directory_is_64_bit_blacklisted,$(LOCAL_PATH)),true) -my_module_arch_supported := false endif else # LOCAL_2ND_ARCH_VAR_PREFIX ifeq ($(my_module_multilib),first) |