From 0d44125b023a7d1b4423ec5417b3e172d2eab5d2 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Tue, 14 Apr 2015 18:02:20 -0700
Subject: [PATCH] Fix makeUniquePackageNames

makeUniquePackageNames never assigned to pkgs, so all packages
were using their short names, even if another package had the
same short name.

Change-Id: I5420f7839efd25362d6c5d85265399ce7b29ddb2
---
 context.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/context.go b/context.go
index 73b5e35..c6be581 100644
--- a/context.go
+++ b/context.go
@@ -1795,6 +1795,7 @@ func (c *Context) makeUniquePackageNames(
 			// No collision so far.  Tentatively set the package's name to be
 			// its short name.
 			pkgNames[pctx] = pctx.shortName
+			pkgs[pctx.shortName] = pctx
 		}
 	}