commit 1d31ec3667d234172decc9a9bdf32dcc6652822a
author Dan Willemsen <dwillemsen@google.com> Tue Sep 22 16:56:09 2015 -0700
committer Dan Willemsen <dwillemsen@google.com> Wed Sep 23 15:31:39 2015 -0700
tree d2f3342288e30f8d71ba71075d0175fe8dd3fb0f
parent e9862da7dd8d9911d26472248294069ba4f3e515

Add ProductVariables.DeviceName, set defaults to flounder

Using flounder defaults to compare against make.

Change-Id: I88fb0809e84b78ef005b76f255017a4d4a35fd13

common/config.go

diff --git a/common/config.go b/common/config.go
index 1cd75d3..1340db8 100644
--- a/common/config.go
+++ b/common/config.go
@@ -211,7 +211,7 @@
 // DeviceName returns the name of the current device target
 // TODO: take an AndroidModuleContext to select the device name for multi-device builds
 func (c *config) DeviceName() string {
-	return "unset"
+	return *c.ProductVariables.DeviceName
 }
 
 // DeviceOut returns the path to out directory for device targets