equal
deleted
inserted
replaced
254 |
254 |
255 PRODUCT_TARGETS += $(BUILD_JRE_SYMBOLS_BUNDLE) |
255 PRODUCT_TARGETS += $(BUILD_JRE_SYMBOLS_BUNDLE) |
256 |
256 |
257 $(eval $(call SetupBundleFile, BUILD_DEMOS_BUNDLE, \ |
257 $(eval $(call SetupBundleFile, BUILD_DEMOS_BUNDLE, \ |
258 BUNDLE_NAME := $(DEMOS_BUNDLE_NAME), \ |
258 BUNDLE_NAME := $(DEMOS_BUNDLE_NAME), \ |
259 FILES := $(call DoubleDollar, $(DEMOS_BUNDLE_FILES)), \ |
259 FILES := $(DEMOS_BUNDLE_FILES), \ |
260 BASE_DIR := $(JDK_IMAGE_DIR), \ |
260 BASE_DIR := $(JDK_IMAGE_DIR), \ |
261 SUBDIR := $(JDK_BUNDLE_SUBDIR), \ |
261 SUBDIR := $(JDK_BUNDLE_SUBDIR), \ |
262 )) |
262 )) |
263 |
263 |
264 PRODUCT_TARGETS += $(BUILD_DEMOS_BUNDLE) |
264 PRODUCT_TARGETS += $(BUILD_DEMOS_BUNDLE) |
269 ifneq ($(filter test-bundles, $(MAKECMDGOALS)), ) |
269 ifneq ($(filter test-bundles, $(MAKECMDGOALS)), ) |
270 TEST_BUNDLE_FILES := $(call CacheFind, $(TEST_IMAGE_DIR)) |
270 TEST_BUNDLE_FILES := $(call CacheFind, $(TEST_IMAGE_DIR)) |
271 |
271 |
272 $(eval $(call SetupBundleFile, BUILD_TEST_BUNDLE, \ |
272 $(eval $(call SetupBundleFile, BUILD_TEST_BUNDLE, \ |
273 BUNDLE_NAME := $(TEST_BUNDLE_NAME), \ |
273 BUNDLE_NAME := $(TEST_BUNDLE_NAME), \ |
274 FILES := $(call DoubleDollar, $(TEST_BUNDLE_FILES)), \ |
274 FILES := $(TEST_BUNDLE_FILES), \ |
275 BASE_DIR := $(TEST_IMAGE_DIR), \ |
275 BASE_DIR := $(TEST_IMAGE_DIR), \ |
276 )) |
276 )) |
277 |
277 |
278 TEST_TARGETS += $(BUILD_TEST_BUNDLE) |
278 TEST_TARGETS += $(BUILD_TEST_BUNDLE) |
279 endif |
279 endif |