Merge jdk7-b112

Fri, 24 Sep 2010 16:38:02 -0700

author
lana
date
Fri, 24 Sep 2010 16:38:02 -0700
changeset 221
b852103caf73
parent 216
989da1ce9287
parent 220
87e98a1df774
child 222
c1df968c4527
child 226
befdbb69155b

Merge

     1.1 --- a/make/hotspot-rules.gmk	Thu Sep 23 17:33:18 2010 -0700
     1.2 +++ b/make/hotspot-rules.gmk	Fri Sep 24 16:38:02 2010 -0700
     1.3 @@ -73,7 +73,11 @@
     1.4  endif
     1.5  
     1.6  ifeq ($(ZERO_BUILD), true)
     1.7 -  HOTSPOT_TARGET := $(HOTSPOT_TARGET)zero
     1.8 +  ifeq ($(SHARK_BUILD), true)
     1.9 +    HOTSPOT_TARGET := $(HOTSPOT_TARGET)shark
    1.10 +  else
    1.11 +    HOTSPOT_TARGET := $(HOTSPOT_TARGET)zero
    1.12 +  endif
    1.13  endif
    1.14  
    1.15  HOTSPOT_BUILD_ARGUMENTS += $(COMMON_BUILD_ARGUMENTS)

mercurial