commit ddd7c919d243bb73ce1590463af18c0f0f05c95a
author Colin Cross <ccross@android.com> Fri Feb 07 07:53:23 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 07 07:53:23 2014 +0000
tree 6a3995453d5e67cd53c6ac003615e63bc2815f41
parent 4d5fa510977d8d698ec75d128efc4e71173ae697
parent 5e9a20337e1110868296c27f201e4579e5e3fb9e

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

* commit '5e9a20337e1110868296c27f201e4579e5e3fb9e':
  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 :=