diff options
| author | Colin Cross <ccross@android.com> | 2014-02-12 20:57:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-02-12 20:57:25 +0000 |
| commit | 7cd7bd65fd2e81b8c05787fd7f0b8c91b6033239 (patch) | |
| tree | 38c700e03fa12d488cd86f068a17d72633b04ce0 /core/definitions.mk | |
| parent | cd958154a5bdb753274a338e799c3ece96ea9c5c (diff) | |
| parent | 02e31d240a9044b54ee793902ad958894f84e7a1 (diff) | |
| download | build-7cd7bd65fd2e81b8c05787fd7f0b8c91b6033239.zip build-7cd7bd65fd2e81b8c05787fd7f0b8c91b6033239.tar.gz build-7cd7bd65fd2e81b8c05787fd7f0b8c91b6033239.tar.bz2 | |
Merge topic 'arm64'
* changes:
HACK: add 64-bit directory blacklist
add support for module supported or unsupported target architectures
Diffstat (limited to 'core/definitions.mk')
| -rw-r--r-- | core/definitions.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/core/definitions.mk b/core/definitions.mk index e0e9608..cb324dd 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -450,11 +450,13 @@ $(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 $(strip $(5)),$(TARGET_2ND_ARCH_VAR_PREFIX))) \ + $(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)) \ - , \ - $(eval _idfIntBase := $($(_idf2ndArchPrefix)$(_idfPrefix)_OUT_INTERMEDIATES)) \ + ,$(if $(filter $(_idfPrefix)-$(_idfClass),TARGET-SHARED_LIBRARIES TARGET-STATIC_LIBRARIES TARGET-EXECUTABLES),\ + $(eval _idfIntBase := $($(_idf2ndArchPrefix)$(_idfPrefix)_OUT_INTERMEDIATES)) \ + ,$(eval _idfIntBase := $($(_idfPrefix)_OUT_INTERMEDIATES)) \ + ) \ ) \ $(_idfIntBase)/$(_idfClass)/$(_idfName)_intermediates \ ) |