comparison make/CopyIntoClasses.gmk @ 9991:1a6c78863ead

8038876: Remove use of ServiceLoader in finding class implementing sun.java2d.cmm.CMMServiceProvider Reviewed-by: bae, mchung
author prr
date Mon, 12 May 2014 09:32:23 -0700
parents 28b9b1940ff3
children 5a9976e5f0ca
comparison
equal deleted inserted replaced
4:d83e467ac0a1 5:368b614a7639
109 $(ALL_META-INF_DIRS_share)) 109 $(ALL_META-INF_DIRS_share))
110 else 110 else
111 ALL_META-INF_DIRS := $(ALL_META-INF_DIRS_share) 111 ALL_META-INF_DIRS := $(ALL_META-INF_DIRS_share)
112 endif 112 endif
113 113
114 ifndef OPENJDK
115 ALL_META-INF_DIRS += $(JDK_TOPDIR)/src/closed/share/classes/sun/java2d/cmm/kcms/META-INF
116 endif
117
118 SRC_SERVICES_FILES := $(wildcard $(addsuffix /services/*, $(ALL_META-INF_DIRS))) 114 SRC_SERVICES_FILES := $(wildcard $(addsuffix /services/*, $(ALL_META-INF_DIRS)))
119
120 ifdef OPENJDK
121 SRC_SERVICES_FILES := $(filter-out %sun/java2d/cmm/kcms/META-INF/services/sun.java2d.cmm.CMMServiceProvider, $(SRC_SERVICES_FILES))
122 else
123 SRC_SERVICES_FILES := $(filter-out %sun/java2d/cmm/lcms/META-INF/services/sun.java2d.cmm.CMMServiceProvider, $(SRC_SERVICES_FILES))
124 endif
125 115
126 # The number of services files are relatively few. If the increase in numbers, then 116 # The number of services files are relatively few. If the increase in numbers, then
127 # we have to use ListPathsSafelyNow here. 117 # we have to use ListPathsSafelyNow here.
128 # Change $(JDK_TOPDIR)/src/.../META-INF/services/yyyy into $(JDK_OUTPUTDIR)/classes/META-INF/services/yyyy 118 # Change $(JDK_TOPDIR)/src/.../META-INF/services/yyyy into $(JDK_OUTPUTDIR)/classes/META-INF/services/yyyy
129 # The \n in the printf command is needed to make sed work on Solaris. 119 # The \n in the printf command is needed to make sed work on Solaris.