Thu, 08 Nov 2012 12:24:35 +0100
8003161: small fixes to re-enable new build system
Reviewed-by: dholmes, alanb, erikj
common/makefiles/JavaCompilation.gmk | file | annotate | diff | comparison | revisions |
1.1 --- a/common/makefiles/JavaCompilation.gmk Wed Nov 07 15:32:13 2012 -0800 1.2 +++ b/common/makefiles/JavaCompilation.gmk Thu Nov 08 12:24:35 2012 +0100 1.3 @@ -111,7 +111,7 @@ 1.4 ifeq ($$(word 20,$$($1_GREP_INCLUDE_PATTERNS)),) 1.5 $1_GREP_INCLUDES:=| $(GREP) $$(patsubst %,$(SPACE)-e$(SPACE)$(DQUOTE)%$(DQUOTE),$$($1_GREP_INCLUDE_PATTERNS)) 1.6 else 1.7 - $$(shell $(RM) $$($1_BIN)/_the.$$($1_JARNAME)_include) 1.8 + $$(shell $(MKDIR) -p $$($1_BIN) && $(RM) $$($1_BIN)/_the.$$($1_JARNAME)_include) 1.9 $$(eval $$(call ListPathsSafelyNow,$1_GREP_INCLUDE_PATTERNS,\n, \ 1.10 >> $$($1_BIN)/_the.$$($1_JARNAME)_include)) 1.11 $1_GREP_INCLUDES:=| $(GREP) -f $$($1_BIN)/_the.$$($1_JARNAME)_include 1.12 @@ -124,7 +124,7 @@ 1.13 ifeq ($$(word 20,$$($1_GREP_EXCLUDE_PATTERNS)),) 1.14 $1_GREP_EXCLUDES:=| $(GREP) -v $$(patsubst %,$(SPACE)-e$(SPACE)$(DQUOTE)%$(DQUOTE),$$($1_GREP_EXCLUDE_PATTERNS)) 1.15 else 1.16 - $$(shell $(RM) $$($1_BIN)/_the.$$($1_JARNAME)_exclude) 1.17 + $$(shell $(MKDIR) -p $$($1_BIN) && $(RM) $$($1_BIN)/_the.$$($1_JARNAME)_exclude) 1.18 $$(eval $$(call ListPathsSafelyNow,$1_GREP_EXCLUDE_PATTERNS,\n, \ 1.19 >> $$($1_BIN)/_the.$$($1_JARNAME)_exclude)) 1.20 $1_GREP_EXCLUDES:=| $(GREP) -v -f $$($1_BIN)/_the.$$($1_JARNAME)_exclude