diff options
| author | 2015-08-28 03:39:34 +0000 | |
|---|---|---|
| committer | 2015-08-28 03:39:34 +0000 | |
| commit | 57ff23b0ed02affce494d14d8a0f5e9e4717baf7 (patch) | |
| tree | 77837f85cd893cb692d299cfed5d230ba0952438 | |
| parent | d5deac8db951ec0a1c9edd806ea1758b836f8c46 (diff) | |
| parent | 85ac8d2a00814459a3f2ec4e80d0695330191d35 (diff) | |
Merge "Add support for LOCAL_SRC_FILES_(host)_(arch)"
| -rw-r--r-- | core/binary.mk | 2 | ||||
| -rw-r--r-- | core/clear_vars.mk | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/core/binary.mk b/core/binary.mk index 7b629d80a0..cb045cc8f1 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -154,7 +154,7 @@ endif endif ifdef LOCAL_IS_HOST_MODULE -my_src_files += $(LOCAL_SRC_FILES_$($(my_prefix)OS)) +my_src_files += $(LOCAL_SRC_FILES_$($(my_prefix)OS)) $(LOCAL_SRC_FILES_$($(my_prefix)OS)_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) my_static_libraries += $(LOCAL_STATIC_LIBRARIES_$($(my_prefix)OS)) my_shared_libraries += $(LOCAL_SHARED_LIBRARIES_$($(my_prefix)OS)) my_cflags += $(LOCAL_CFLAGS_$($(my_prefix)OS)) diff --git a/core/clear_vars.mk b/core/clear_vars.mk index 63ae2a2e5f..fb775c90f0 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -267,6 +267,11 @@ LOCAL_C_INCLUDES_$(HOST_OS):= LOCAL_GENERATED_SOURCES_$(HOST_OS):= LOCAL_REQUIRED_MODULES_$(HOST_OS):= +LOCAL_SRC_FILES_$(HOST_OS)_$(HOST_ARCH):= +ifdef HOST_2ND_ARCH +LOCAL_SRC_FILES_$(HOST_OS)_$(HOST_2ND_ARCH):= +endif + LOCAL_SRC_FILES_32:= LOCAL_SRC_FILES_64:= LOCAL_SHARED_LIBRARIES_32:= |