From 58d879f4f4eef79f9f2d81f11e60177f76719e13 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Tue, 4 Feb 2014 11:16:16 -0800
Subject: [PATCH] don't rename 32-bit packages to *_32

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

Change-Id: I5457c07b64885d77a6bd8fbcbba97d28393c581d
---
 core/package.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/package.mk b/core/package.mk
index 559a3d9aa..f678b3c82 100644
--- a/core/package.mk
+++ b/core/package.mk
@@ -31,6 +31,8 @@ else
 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:=
@@ -474,4 +476,6 @@ endif # skip_definition
 # Reset internal variables.
 all_res_assets :=
 
+LOCAL_NO_2ND_ARCH_MODULE_SUFFIX :=
+
 LOCAL_2ND_ARCH_VAR_PREFIX :=