diff options
| author | lana <none@none> | 2010-09-24 16:38:02 -0700 |
|---|---|---|
| committer | lana <none@none> | 2010-09-24 16:38:02 -0700 |
| commit | 569484837627afc5e2bfb7928429b7e4357551c1 (patch) | |
| tree | f6ba8054e7f16ba418027a383b23384210850da3 | |
| parent | 2ea67761b1eecbb9f63a157c71db413a973fadc9 (diff) | |
| parent | 8a806dcee24f92e50e80fac1be837c6164cba3e1 (diff) | |
Mergejdk7-b112
| -rw-r--r-- | make/hotspot-rules.gmk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/make/hotspot-rules.gmk b/make/hotspot-rules.gmk index 72d6f14..9a85b93 100644 --- a/make/hotspot-rules.gmk +++ b/make/hotspot-rules.gmk @@ -73,7 +73,11 @@ ifeq ($(DEBUG_NAME), fastdebug) 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) |