diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/base_rules.mk | 13 | ||||
| -rw-r--r-- | core/binary.mk | 2 | ||||
| -rw-r--r-- | core/clear_vars.mk | 2 |
3 files changed, 15 insertions, 2 deletions
diff --git a/core/base_rules.mk b/core/base_rules.mk index 32e6b73..051addc 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -99,8 +99,21 @@ ifneq ($(words $(LOCAL_MODULE_CLASS)),1) $(error $(LOCAL_PATH): LOCAL_MODULE_CLASS must contain exactly one word, not "$(LOCAL_MODULE_CLASS)") endif +ifndef LOCAL_IS_HOST_MODULE +my_32_64_bit_suffix := $(if $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_IS_64_BIT),64,32) +endif + ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE)) +ifndef LOCAL_IS_HOST_MODULE +my_multilib_module_path := $(strip $(LOCAL_MODULE_PATH_$(my_32_64_bit_suffix))) +else +my_multilib_module_path := +endif +ifdef my_multilib_module_path +my_module_path := $(my_multilib_module_path) +else my_module_path := $(strip $(LOCAL_MODULE_PATH)) +endif my_module_relative_path := $(strip $(LOCAL_MODULE_RELATIVE_PATH)) ifeq ($(my_module_path),) ifdef LOCAL_IS_HOST_MODULE diff --git a/core/binary.mk b/core/binary.mk index 5011129..cc8de46 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -106,8 +106,6 @@ my_c_includes := $(LOCAL_C_INCLUDES) my_generated_sources := $(LOCAL_GENERATED_SOURCES) ifndef LOCAL_IS_HOST_MODULE -my_32_64_bit_suffix := $(if $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_IS_64_BIT),64,32) - my_src_files += $(LOCAL_SRC_FILES_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_SRC_FILES_$(my_32_64_bit_suffix)) my_shared_libraries += $(LOCAL_SHARED_LIBRARIES_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_SHARED_LIBRARIES_$(my_32_64_bit_suffix)) my_cflags += $(LOCAL_CFLAGS_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_CFLAGS_$(my_32_64_bit_suffix)) diff --git a/core/clear_vars.mk b/core/clear_vars.mk index 4c403b4..5aa228f 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -197,6 +197,8 @@ LOCAL_ASFLAGS_32:= LOCAL_ASFLAGS_64:= LOCAL_C_INCLUDES_32:= LOCAL_C_INCLUDES_64:= +LOCAL_MODULE_PATH_32:= +LOCAL_MODULE_PATH_64:= # Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to # iterate over thousands of entries every time. |