Mercurial > hg > openjdk > aarch64-port > jdk
changeset 10924:60393b320a6e
8129850: java.util.Properties.loadFromXML fails on compact1 profile
Reviewed-by: erikj, alanb
author | dholmes |
---|---|
date | Fri, 26 Jun 2015 18:34:58 -0400 |
parents | bf5f41bd4710 |
children | 48143da4c15d |
files | make/CreateJars.gmk |
diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/make/CreateJars.gmk Fri Jun 26 16:31:09 2015 +0000 +++ b/make/CreateJars.gmk Fri Jun 26 18:34:58 2015 -0400 @@ -283,15 +283,15 @@ -e '/_the\.*' -e '^_the\.*' -e '\\_the\.*' -e 'javac_state' \ $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.contents > $@.tmp ifneq ($(PROFILE), ) + # Strip out all META-INF/services/ entries + $(GREP) -v -e 'META-INF/services/' $@.tmp > $@.tmp2 ifneq ($(strip $(PROFILE_INCLUDE_METAINF_SERVICES)), ) - # Strip out all META-INF/services/ entries - $(GREP) -v -e 'META-INF/services/' $@.tmp > $@.tmp2 # Add back the required services for service in $(PROFILE_INCLUDE_METAINF_SERVICES) ; do \ $(ECHO) $$service >> $@.tmp2; \ done - $(MV) $@.tmp2 $@.tmp endif + $(MV) $@.tmp2 $@.tmp endif $(MV) $@.tmp $@