提交 ddbcf195 编写于 作者: A asaha

Merge

...@@ -742,6 +742,7 @@ a106723ba50719c479614d1f599e951edb51506c jdk8u65-b11 ...@@ -742,6 +742,7 @@ a106723ba50719c479614d1f599e951edb51506c jdk8u65-b11
a5fbc6967cf5d170be56c9804b90ebb6bbd02832 jdk8u65-b12 a5fbc6967cf5d170be56c9804b90ebb6bbd02832 jdk8u65-b12
529bea83b67412ffb5a7eb0ed8f8772732bbf446 jdk8u65-b13 529bea83b67412ffb5a7eb0ed8f8772732bbf446 jdk8u65-b13
ccc03258fbcfbcdf515ceb87bd3699c8f849dc0d jdk8u65-b14 ccc03258fbcfbcdf515ceb87bd3699c8f849dc0d jdk8u65-b14
03ca585abe68e4dcce5bc162a0fa0593eb8fa2ee jdk8u65-b15
878cb0df27c22c6b1e9f4add1eb3da3edc8ab51d jdk8u66-b00 878cb0df27c22c6b1e9f4add1eb3da3edc8ab51d jdk8u66-b00
777a354cada52b831a32bfc5362ad7cedfde4450 jdk8u66-b01 777a354cada52b831a32bfc5362ad7cedfde4450 jdk8u66-b01
0366ad2644f58ec88af9cb2ea8c23a02559fb2d1 hs25.66-b02 0366ad2644f58ec88af9cb2ea8c23a02559fb2d1 hs25.66-b02
...@@ -755,4 +756,5 @@ aedefb75358f3cda5181bf594c2cda833056b25a jdk8u66-b08 ...@@ -755,4 +756,5 @@ aedefb75358f3cda5181bf594c2cda833056b25a jdk8u66-b08
ab64d7ea4f48ea4bdbcc43d4a653be157d9c29e3 jdk8u66-b12 ab64d7ea4f48ea4bdbcc43d4a653be157d9c29e3 jdk8u66-b12
4d699853544cf869d4edaf23b7cc9cfbb2900a2b jdk8u66-b13 4d699853544cf869d4edaf23b7cc9cfbb2900a2b jdk8u66-b13
9f7f29ff487ae023ca1f697445004a532751b0d2 jdk8u66-b14 9f7f29ff487ae023ca1f697445004a532751b0d2 jdk8u66-b14
5b67af3317bce1f940c5dc1535411a1002bed6c1 jdk8u66-b15
9a158a0c243beb610dbaabd63d6218d3ce5825f1 jdk8u71-b00 9a158a0c243beb610dbaabd63d6218d3ce5825f1 jdk8u71-b00
...@@ -56,8 +56,12 @@ TraceGeneratedNames = \ ...@@ -56,8 +56,12 @@ TraceGeneratedNames = \
ifeq ($(HAS_ALT_SRC), true) ifeq ($(HAS_ALT_SRC), true)
TraceGeneratedNames += \ TraceGeneratedNames += \
traceRequestables.hpp \ traceRequestables.hpp \
traceEventControl.hpp \ traceEventControl.hpp
traceProducer.cpp
ifneq ($(INCLUDE_TRACE), false)
TraceGeneratedNames += traceProducer.cpp
endif
endif endif
TraceGeneratedFiles = $(TraceGeneratedNames:%=$(TraceOutDir)/%) TraceGeneratedFiles = $(TraceGeneratedNames:%=$(TraceOutDir)/%)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册