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