equal
deleted
inserted
replaced
27 |
27 |
28 default: all |
28 default: all |
29 |
29 |
30 include $(SPEC) |
30 include $(SPEC) |
31 include MakeBase.gmk |
31 include MakeBase.gmk |
|
32 include Execute.gmk |
32 include $(TOPDIR)/make/ModuleTools.gmk |
33 include $(TOPDIR)/make/ModuleTools.gmk |
33 |
34 |
34 ################################################################################ |
35 ################################################################################ |
35 |
36 |
36 PACKAGES_ATTRIBUTE_TARGET := $(JDK_OUTPUTDIR)/_packages_attribute.done |
|
37 ALL_MODULEINFO_CLASSES := $(wildcard $(JDK_OUTPUTDIR)/modules/*/module-info.class) |
37 ALL_MODULEINFO_CLASSES := $(wildcard $(JDK_OUTPUTDIR)/modules/*/module-info.class) |
38 |
38 |
39 $(PACKAGES_ATTRIBUTE_TARGET): $(ALL_MODULEINFO_CLASSES) $(BUILD_JIGSAW_CLASSES) |
39 $(eval $(call SetupExecute, optimize_image, \ |
40 $(call LogInfo, Optimizing the exploded image) |
40 INFO := Optimizing the exploded image, \ |
41 $(call ExecuteWithLog, $@, $(TOOL_ADD_PACKAGES_ATTRIBUTE) $(JDK_OUTPUTDIR)) |
41 DEPS := $(ALL_MODULEINFO_CLASSES) $(BUILD_JIGSAW_CLASSES), \ |
42 $(TOUCH) $@ |
42 OUTPUT_DIR := $(JDK_OUTPUTDIR), \ |
|
43 COMMAND := $(TOOL_ADD_PACKAGES_ATTRIBUTE) $(JDK_OUTPUTDIR), \ |
|
44 )) |
43 |
45 |
44 TARGETS := $(PACKAGES_ATTRIBUTE_TARGET) |
46 TARGETS := $(optimize_image_TARGET) |
45 |
47 |
46 ################################################################################ |
48 ################################################################################ |
47 |
49 |
48 all: $(TARGETS) |
50 all: $(TARGETS) |
49 |
51 |