diff options
| author | Colin Cross <ccross@android.com> | 2014-02-04 11:16:16 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2014-02-04 19:44:09 -0800 |
| commit | aee1e779f4caf96179793efd03b10590c3ddf6cd (patch) | |
| tree | ca975ebb479b13aae06790665813c3aaa9a2b31a /core | |
| parent | ec14ce578b10bc454996c5821576360088302808 (diff) | |
| download | build-aee1e779f4caf96179793efd03b10590c3ddf6cd.zip build-aee1e779f4caf96179793efd03b10590c3ddf6cd.tar.gz build-aee1e779f4caf96179793efd03b10590c3ddf6cd.tar.bz2 | |
don't rename 32-bit executables to *_32
Renaming 32-bit executables to *_32 breaks PRODUCT_PACKAGES
dependencies.
Change-Id: I53d89991633ef4af03c4e618c463769937a70e38
Diffstat (limited to 'core')
| -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 := |