Merge
This commit is contained in:
commit
a252fc3e6c
@ -73,7 +73,11 @@ ifeq ($(DEBUG_NAME), fastdebug)
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(ZERO_BUILD), true)
|
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
|
endif
|
||||||
|
|
||||||
HOTSPOT_BUILD_ARGUMENTS += $(COMMON_BUILD_ARGUMENTS)
|
HOTSPOT_BUILD_ARGUMENTS += $(COMMON_BUILD_ARGUMENTS)
|
||||||
|
Loading…
Reference in New Issue
Block a user