commit e3ae5a467799f063ebdcfe85786b0f625a30d4ad
author Colin Cross <ccross@android.com> Sat Feb 08 07:22:46 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Feb 08 07:22:46 2014 +0000
tree a008de9bfabc8455fb3942da444b04c7863155db
parent 3e3cde556f30547e66638f89a4c3ce04b60b73cc
parent ddd7c919d243bb73ce1590463af18c0f0f05c95a

am ddd7c919: am 5e9a2033: Merge "don\'t rename 32-bit packages to *_32"

* commit 'ddd7c919d243bb73ce1590463af18c0f0f05c95a':
  don't rename 32-bit packages to *_32

core/package.mk

diff --git a/core/package.mk b/core/package.mk
index 7e69137..6ea5067 100644
--- a/core/package.mk
+++ b/core/package.mk
@@ -31,6 +31,8 @@
 LOCAL_2ND_ARCH_VAR_PREFIX :=
 endif
 
+LOCAL_NO_2ND_ARCH_MODULE_SUFFIX := true
+
 # If this makefile is being read from within an inheritance,
 # use the new values.
 skip_definition:=
@@ -471,4 +473,6 @@
 # Reset internal variables.
 all_res_assets :=
 
+LOCAL_NO_2ND_ARCH_MODULE_SUFFIX :=
+
 LOCAL_2ND_ARCH_VAR_PREFIX :=