From 12d18eb563877e68da0041261fadde0a9ffaa147 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Thu, 22 May 2014 12:01:23 -0700
Subject: [PATCH] set a prebuilt directory name for the 2nd arch

In order to install 32-bit gdbserver on a 64-bit build,
prebuilts/misc/Android.mk needs to know the prebuilt directory name
for the 2nd arch.

Change-Id: Ibc943b758eb9404f7f5f9fbbd8720cc67f6a6f01
---
 core/config.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/config.mk b/core/config.mk
index b91ff7f5e..715038053 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -579,6 +579,9 @@ INTERNAL_PLATFORM_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/publi
 # This is the standard way to name a directory containing prebuilt target
 # objects. E.g., prebuilt/$(TARGET_PREBUILT_TAG)/libc.so
 TARGET_PREBUILT_TAG := android-$(TARGET_ARCH)
+ifdef TARGET_2ND_ARCH
+TARGET_2ND_PREBUILT_TAG := android-$(TARGET_2ND_ARCH)
+endif
 
 # Set up RS prebuilt variables for compatibility library
 
-- 
2.11.0