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

Commit 59d0c658 authored by Torne (Richard Coles)'s avatar Torne (Richard Coles) Committed by Android Git Automerger
Browse files

am c783b9bd: Merge "Add GYP as a target type that requires 2nd arch." 

* commit 'c783b9bd':
  Add GYP as a target type that requires 2nd arch.
parents 81fc969b c783b9bd

core/definitions.mk

+1 −1
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ $(strip \ 
    $(eval _idf2ndArchPrefix := $(if $(call directory_is_64_bit_blacklisted,$(LOCAL_PATH))$(strip $(5)),$(TARGET_2ND_ARCH_VAR_PREFIX))) \

    $(if $(filter $(_idfPrefix)-$(_idfClass),$(COMMON_MODULE_CLASSES))$(4), \

        $(eval _idfIntBase := $($(_idfPrefix)_OUT_COMMON_INTERMEDIATES)) \

      ,$(if $(filter $(_idfPrefix)-$(_idfClass),TARGET-SHARED_LIBRARIES TARGET-STATIC_LIBRARIES TARGET-EXECUTABLES),\

      ,$(if $(filter $(_idfPrefix)-$(_idfClass),TARGET-SHARED_LIBRARIES TARGET-STATIC_LIBRARIES TARGET-EXECUTABLES TARGET-GYP),\

          $(eval _idfIntBase := $($(_idf2ndArchPrefix)$(_idfPrefix)_OUT_INTERMEDIATES)) \

       ,$(eval _idfIntBase := $($(_idfPrefix)_OUT_INTERMEDIATES)) \

       ) \