提交 f21eba8a 编写于 作者: H herrick

Merge

...@@ -85,3 +85,5 @@ f8be576feefce0c6695f188ef97ec16b73ad9cfd jdk7-b104 ...@@ -85,3 +85,5 @@ f8be576feefce0c6695f188ef97ec16b73ad9cfd jdk7-b104
140fdef4ddf52244013b6157dc542cd9f677bb6f jdk7-b108 140fdef4ddf52244013b6157dc542cd9f677bb6f jdk7-b108
81dfc728d7bb7e1fff4a4dc6d0f7cea5a3315667 jdk7-b109 81dfc728d7bb7e1fff4a4dc6d0f7cea5a3315667 jdk7-b109
2a02d4a6955c7c078aee9a604cb3be409800d82c jdk7-b110 2a02d4a6955c7c078aee9a604cb3be409800d82c jdk7-b110
9702d6fef68e17533ee7fcf5923b11ead3e912ce jdk7-b111
b852103caf73da70068473777ae867a457bb3ae1 jdk7-b112
...@@ -73,7 +73,11 @@ ifeq ($(DEBUG_NAME), fastdebug) ...@@ -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)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册