equal
deleted
inserted
replaced
203 $(ALL_JDK_FILES) \ |
203 $(ALL_JDK_FILES) \ |
204 ) \ |
204 ) \ |
205 ) \ |
205 ) \ |
206 $(call CacheFind, $(SYMBOLS_IMAGE_DIR)) |
206 $(call CacheFind, $(SYMBOLS_IMAGE_DIR)) |
207 |
207 |
|
208 TEST_DEMOS_BUNDLE_FILES := $(filter $(JDK_IMAGE_HOMEDIR)/demo/%, $(ALL_JDK_FILES)) |
|
209 |
208 ALL_JRE_FILES := $(call CacheFind, $(JRE_IMAGE_DIR)) |
210 ALL_JRE_FILES := $(call CacheFind, $(JRE_IMAGE_DIR)) |
209 |
211 |
210 # Create special filter rules when dealing with unzipped .dSYM directories on |
212 # Create special filter rules when dealing with unzipped .dSYM directories on |
211 # macosx |
213 # macosx |
212 ifeq ($(OPENJDK_TARGET_OS), macosx) |
214 ifeq ($(OPENJDK_TARGET_OS), macosx) |
262 UNZIP_DEBUGINFO := true, \ |
264 UNZIP_DEBUGINFO := true, \ |
263 )) |
265 )) |
264 |
266 |
265 PRODUCT_TARGETS += $(BUILD_JRE_SYMBOLS_BUNDLE) |
267 PRODUCT_TARGETS += $(BUILD_JRE_SYMBOLS_BUNDLE) |
266 |
268 |
|
269 # The demo bundle is only created to support client tests. Ideally it should |
|
270 # be built with the main test bundle, but since the prerequisites match |
|
271 # better with the product build, it makes more sense to keep it there for now. |
|
272 $(eval $(call SetupBundleFile, BUILD_TEST_DEMOS_BUNDLE, \ |
|
273 BUNDLE_NAME := $(TEST_DEMOS_BUNDLE_NAME), \ |
|
274 FILES := $(TEST_DEMOS_BUNDLE_FILES), \ |
|
275 BASE_DIRS := $(JDK_IMAGE_DIR), \ |
|
276 SUBDIR := $(JDK_BUNDLE_SUBDIR), \ |
|
277 )) |
|
278 |
|
279 PRODUCT_TARGETS += $(BUILD_TEST_DEMOS_BUNDLE) |
267 endif |
280 endif |
268 |
281 |
269 ################################################################################ |
282 ################################################################################ |
270 |
283 |
271 ifneq ($(filter profiles-bundles, $(MAKECMDGOALS)), ) |
284 ifneq ($(filter profiles-bundles, $(MAKECMDGOALS)), ) |