Merge

Tue, 07 Sep 2010 15:51:45 -0700

author
ohair
date
Tue, 07 Sep 2010 15:51:45 -0700
changeset 219
b331aef4bef0
parent 208
d6ea39e0d3eb
parent 218
90357eee5234
child 220
87e98a1df774
child 224
ed13debe9a5e

Merge

     1.1 --- a/make/hotspot-rules.gmk	Tue Sep 07 15:13:58 2010 -0700
     1.2 +++ b/make/hotspot-rules.gmk	Tue Sep 07 15:51:45 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