From 3972253b0f29f6e0020cce0fe011ee5c696988e8 Mon Sep 17 00:00:00 2001 From: "Torne (Richard Coles)" Date: Wed, 2 Apr 2014 11:26:44 +0100 Subject: [PATCH] Add GYP as a target type that requires 2nd arch. "GYP" class targets are used by external/chromium_org for gyp's "none" type. The processing in these targets needs a separate intermediate directory for the primary/secondary architecture, so add it to the list in intermediates-dir-for along with libraries/executables. Change-Id: Id05899c83b45ed0647dfbfa6b0b2e7f61b04348b --- core/definitions.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/definitions.mk b/core/definitions.mk index a449f0e0a..107813ba0 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -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)) \ ) \