equal
deleted
inserted
replaced
181 JDK_BUNDLE_FILES := \ |
181 JDK_BUNDLE_FILES := \ |
182 $(filter-out \ |
182 $(filter-out \ |
183 $(JDK_SYMBOLS_EXCLUDE_PATTERN) \ |
183 $(JDK_SYMBOLS_EXCLUDE_PATTERN) \ |
184 $(JDK_EXTRA_EXCLUDES) \ |
184 $(JDK_EXTRA_EXCLUDES) \ |
185 $(SYMBOLS_EXCLUDE_PATTERN) \ |
185 $(SYMBOLS_EXCLUDE_PATTERN) \ |
186 $(JDK_IMAGE_HOMEDIR)/demo/% $(JDK_IMAGE_HOMEDIR)/sample/% \ |
186 $(JDK_IMAGE_HOMEDIR)/demo/% \ |
187 , \ |
187 , \ |
188 $(ALL_JDK_FILES) \ |
188 $(ALL_JDK_FILES) \ |
189 ) |
|
190 DEMOS_BUNDLE_FILES := \ |
|
191 $(filter-out \ |
|
192 $(JDK_SYMBOLS_EXCLUDE_PATTERN) \ |
|
193 $(SYMBOLS_EXCLUDE_PATTERN) \ |
|
194 , \ |
|
195 $(filter \ |
|
196 $(JDK_IMAGE_HOMEDIR)/demo/% $(JDK_IMAGE_HOMEDIR)/sample/% \ |
|
197 $(JDK_IMAGE_HOMEDIR)/release \ |
|
198 , \ |
|
199 $(ALL_JDK_FILES) \ |
|
200 ) \ |
|
201 ) |
189 ) |
202 JDK_SYMBOLS_BUNDLE_FILES := \ |
190 JDK_SYMBOLS_BUNDLE_FILES := \ |
203 $(filter \ |
191 $(filter \ |
204 $(JDK_SYMBOLS_EXCLUDE_PATTERN) \ |
192 $(JDK_SYMBOLS_EXCLUDE_PATTERN) \ |
205 $(SYMBOLS_EXCLUDE_PATTERN) \ |
193 $(SYMBOLS_EXCLUDE_PATTERN) \ |
206 , \ |
194 , \ |
207 $(filter-out \ |
195 $(filter-out \ |
208 $(JDK_IMAGE_HOMEDIR)/demo/% $(JDK_IMAGE_HOMEDIR)/sample/% \ |
196 $(JDK_IMAGE_HOMEDIR)/demo/% \ |
209 , \ |
197 , \ |
210 $(ALL_JDK_FILES) \ |
198 $(ALL_JDK_FILES) \ |
211 ) \ |
199 ) \ |
212 ) \ |
200 ) \ |
213 $(call CacheFind, $(SYMBOLS_IMAGE_DIR)) |
201 $(call CacheFind, $(SYMBOLS_IMAGE_DIR)) |
269 UNZIP_DEBUGINFO := true, \ |
257 UNZIP_DEBUGINFO := true, \ |
270 )) |
258 )) |
271 |
259 |
272 PRODUCT_TARGETS += $(BUILD_JRE_SYMBOLS_BUNDLE) |
260 PRODUCT_TARGETS += $(BUILD_JRE_SYMBOLS_BUNDLE) |
273 |
261 |
274 $(eval $(call SetupBundleFile, BUILD_DEMOS_BUNDLE, \ |
|
275 BUNDLE_NAME := $(DEMOS_BUNDLE_NAME), \ |
|
276 FILES := $(DEMOS_BUNDLE_FILES), \ |
|
277 BASE_DIRS := $(JDK_IMAGE_DIR), \ |
|
278 SUBDIR := $(JDK_BUNDLE_SUBDIR), \ |
|
279 )) |
|
280 |
|
281 PRODUCT_TARGETS += $(BUILD_DEMOS_BUNDLE) |
|
282 endif |
262 endif |
283 |
263 |
284 ################################################################################ |
264 ################################################################################ |
285 |
265 |
286 ifneq ($(filter profiles-bundles, $(MAKECMDGOALS)), ) |
266 ifneq ($(filter profiles-bundles, $(MAKECMDGOALS)), ) |