diff options
| author | ohair <none@none> | 2010-09-07 15:51:45 -0700 |
|---|---|---|
| committer | ohair <none@none> | 2010-09-07 15:51:45 -0700 |
| commit | 8f0fac854239afe8e65c8bfbbd110e13c8fbb77e (patch) | |
| tree | 9c39f9c8e7d6a278f660a228298d2e249a504e61 /make | |
| parent | d6094000ba44c4a9d8b01c0476a7ff735a398515 (diff) | |
| parent | 0252fe4a6dbbf01126684d5ce2db869ffddc7459 (diff) | |
Merge
Diffstat (limited to 'make')
| -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) |