equal
deleted
inserted
replaced
322 # Avoid doing the expensive find unless called with "jdk" as target. |
322 # Avoid doing the expensive find unless called with "jdk" as target. |
323 ifneq ($(filter jdk, $(MAKECMDGOALS)), ) |
323 ifneq ($(filter jdk, $(MAKECMDGOALS)), ) |
324 |
324 |
325 DEMO_FILES := \ |
325 DEMO_FILES := \ |
326 $(if $(wildcard $(SUPPORT_OUTPUTDIR)/demos/image), \ |
326 $(if $(wildcard $(SUPPORT_OUTPUTDIR)/demos/image), \ |
327 $(call DoubleDollar, \ |
|
328 $(shell $(FIND) $(SUPPORT_OUTPUTDIR)/demos/image \ |
327 $(shell $(FIND) $(SUPPORT_OUTPUTDIR)/demos/image \ |
329 -type f -a ! \( -name "_the*" -o -name "javac_state" \) )) \ |
328 -type f -a ! \( -name "_the*" -o -name "javac_state" \) ) \ |
330 ) |
329 ) |
331 |
330 |
332 ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), true) |
331 ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), true) |
333 ifeq ($(OPENJDK_TARGET_OS), macosx) |
332 ifeq ($(OPENJDK_TARGET_OS), macosx) |
334 DEMO_FILES := $(call not-containing, .dSYM, $(DEMO_FILES)) |
333 DEMO_FILES := $(call not-containing, .dSYM, $(DEMO_FILES)) |