commit aee1e779f4caf96179793efd03b10590c3ddf6cd
author Colin Cross <ccross@android.com> Tue Feb 04 11:16:16 2014 -0800
committer Colin Cross <ccross@android.com> Tue Feb 04 19:44:09 2014 -0800
tree ca975ebb479b13aae06790665813c3aaa9a2b31a
parent ec14ce578b10bc454996c5821576360088302808

don't rename 32-bit executables to *_32

Renaming 32-bit executables to *_32 breaks PRODUCT_PACKAGES
dependencies.

Change-Id: I53d89991633ef4af03c4e618c463769937a70e38

core/executable.mk

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 @@
 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 :=