diff options
| author | lana <none@none> | 2010-09-16 11:18:21 -0700 |
|---|---|---|
| committer | lana <none@none> | 2010-09-16 11:18:21 -0700 |
| commit | 8a806dcee24f92e50e80fac1be837c6164cba3e1 (patch) | |
| tree | 272d485af9025b9d7012751acf6d79c62038bd48 | |
| parent | 403156123614c96fc67c59d18f1ff1f6493890e5 (diff) | |
| parent | 8f0fac854239afe8e65c8bfbbd110e13c8fbb77e (diff) | |
Merge
| -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) |