# HG changeset patch
# User lana
# Date 1285371482 25200
# Node ID b852103caf73da70068473777ae867a457bb3ae1
# Parent  989da1ce928774f861d7e091d1dc61a1cd143f59# Parent  87e98a1df77445b7f4ee685200ae54e15dd5a338
Merge

diff -r 989da1ce9287 -r b852103caf73 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)