# HG changeset patch
# User lana
# Date 1285371482 25200
# Node ID 4dbc2a40aa7633dc89c312071d89ffbfaec719e6
# Parent  480e9c1f1ada6045ce7c081be37b494d43152d65# Parent  35137e065cdf4df4423789aa7233963c8c94186c
Merge

diff -r 480e9c1f1ada -r 4dbc2a40aa76 make/hotspot-rules.gmk
--- a/make/hotspot-rules.gmk	Thu Sep 23 17:33:18 2010 -0700
+++ b/make/hotspot-rules.gmk	Fri Sep 24 16:38:02 2010 -0700
@@ -73,7 +73,11 @@
 endif
 
 ifeq ($(ZERO_BUILD), true)
-  HOTSPOT_TARGET := $(HOTSPOT_TARGET)zero
+  ifeq ($(SHARK_BUILD), true)
+    HOTSPOT_TARGET := $(HOTSPOT_TARGET)shark
+  else
+    HOTSPOT_TARGET := $(HOTSPOT_TARGET)zero
+  endif
 endif
 
 HOTSPOT_BUILD_ARGUMENTS += $(COMMON_BUILD_ARGUMENTS)