# HG changeset patch
# User ohair
# Date 1283899905 25200
# Node ID 42a9ca2788e9561f77e7a4a840e0c6b9ef19a48d
# Parent  bc2db16c1a2a525c710bd54a78eb43cc758e9d14# Parent  58edcdfa14fc425865dc2aac53aa761db0577ace
Merge

diff -r bc2db16c1a2a -r 42a9ca2788e9 make/hotspot-rules.gmk
--- a/make/hotspot-rules.gmk	Tue Sep 07 15:13:58 2010 -0700
+++ b/make/hotspot-rules.gmk	Tue Sep 07 15:51:45 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)