diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-04-02 17:20:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-04-02 17:20:11 +0000 |
| commit | c783b9bda96a6fc97076bb877645255fb01596fb (patch) | |
| tree | 6fd473460000cc25fb870b300b5e5e4948f39043 | |
| parent | cf352c5d7e1482cc80be4eb2bbe99041a2345f8e (diff) | |
| parent | 3972253b0f29f6e0020cce0fe011ee5c696988e8 (diff) | |
| download | build-c783b9bda96a6fc97076bb877645255fb01596fb.tar.gz | |
Merge "Add GYP as a target type that requires 2nd arch."
| -rw-r--r-- | core/definitions.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/definitions.mk b/core/definitions.mk index a449f0e0aa..107813ba02 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)) \ ) \ |