Tue, 07 Dec 2010 16:41:14 -0800
Merge
1.1 --- a/.hgtags Tue Nov 30 09:23:44 2010 -0800 1.2 +++ b/.hgtags Tue Dec 07 16:41:14 2010 -0800 1.3 @@ -94,3 +94,4 @@ 1.4 7220e60b097fa027e922f1aeecdd330f3e37409f jdk7-b117 1.5 a12a9e78df8a9d534da0b4a244ed68f0de0bd58e jdk7-b118 1.6 661360bef6ccad6c119f067f5829b207de80c936 jdk7-b119 1.7 +366ff0b6d2151595629806b033e2e1497e3a55d4 jdk7-b120
2.1 --- a/make/deploy-rules.gmk Tue Nov 30 09:23:44 2010 -0800 2.2 +++ b/make/deploy-rules.gmk Tue Dec 07 16:41:14 2010 -0800 2.3 @@ -46,7 +46,6 @@ 2.4 # Enable 7-Zip LZMA file (de)compression for Java Kernel if it is available 2.5 ifeq ($(ARCH_DATA_MODEL), 32) 2.6 ifeq ($(PLATFORM), windows) 2.7 - ifneq ($(KERNEL), off) 2.8 EC_TMP = $(shell if [ -d $(DEPLOY_TOPDIR)/make/lzma ] ; then \ 2.9 $(ECHO) true ; \ 2.10 else \ 2.11 @@ -55,7 +54,6 @@ 2.12 ifeq ($(EC_TMP), true) 2.13 DEPLOY_BUILD_TARGETS += extra-comp-all 2.14 endif 2.15 - endif 2.16 endif 2.17 endif 2.18