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

Commit a1ac4736 authored by Colin Cross's avatar Colin Cross Committed by Android Git Automerger
Browse files

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

* commit 'b110da5f':
  build: delete 64-bit blacklist
parents 88440c53 b110da5f

core/64_bit_blacklist.mk

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
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

core/definitions.mk

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

core/main.mk

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

core/module_arch_supported.mk

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