diff options
| -rw-r--r-- | core/base_rules.mk | 2 | ||||
| -rw-r--r-- | core/executable.mk | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/core/base_rules.mk b/core/base_rules.mk index e87624a..23d88cf 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -135,8 +135,10 @@ endif my_register_name := $(LOCAL_MODULE) ifdef LOCAL_2ND_ARCH_VAR_PREFIX +ifndef LOCAL_NO_2ND_ARCH_MODULE_SUFFIX my_register_name := $(LOCAL_MODULE)$(TARGET_2ND_ARCH_MODULE_SUFFIX) endif +endif # Make sure that this IS_HOST/CLASS/MODULE combination is unique. module_id := MODULE.$(if \ $(LOCAL_IS_HOST_MODULE),HOST,TARGET).$(LOCAL_MODULE_CLASS).$(my_register_name) diff --git a/core/executable.mk b/core/executable.mk index 22884b8..6d8734e 100644 --- a/core/executable.mk +++ b/core/executable.mk @@ -9,5 +9,7 @@ else LOCAL_2ND_ARCH_VAR_PREFIX := endif +LOCAL_NO_2ND_ARCH_MODULE_SUFFIX := true include $(BUILD_SYSTEM)/executable_internal.mk LOCAL_2ND_ARCH_VAR_PREFIX := +LOCAL_NO_2ND_ARCH_MODULE_SUFFIX := |