Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 483d9241 authored by Joe Onorato's avatar Joe Onorato
Browse files

Put the java source file list files somewhere where they don't 

conflict with the .class files that are getting zipped up, and
delete them when we're done with them.
parent 602a84e0

core/definitions.mk

+11 −9
Original line number Diff line number Diff line
@@ -1239,21 +1239,21 @@ $(hide) rm -rf $(PRIVATE_CLASS_INTERMEDIATES_DIR) 
$(hide) mkdir -p $(PRIVATE_CLASS_INTERMEDIATES_DIR)

$(call unzip-jar-files,$(PRIVATE_STATIC_JAVA_LIBRARIES), \

    $(PRIVATE_CLASS_INTERMEDIATES_DIR))

$(call dump-words-to-file,$(PRIVATE_JAVA_SOURCES),$(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list)

$(call dump-words-to-file,$(PRIVATE_JAVA_SOURCES),$(PRIVATE_INTERMEDIATES_DIR)/java-source-list)

$(hide) if [ -d "$(PRIVATE_SOURCE_INTERMEDIATES_DIR)" ]; then \

	    find $(PRIVATE_SOURCE_INTERMEDIATES_DIR) -name '*.java' >> $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list; \

	    find $(PRIVATE_SOURCE_INTERMEDIATES_DIR) -name '*.java' >> $(PRIVATE_INTERMEDIATES_DIR)/java-source-list; \

fi

$(hide) tr ' ' '\n' < $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list \

    | sort -u > $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq

$(hide) tr ' ' '\n' < $(PRIVATE_INTERMEDIATES_DIR)/java-source-list \

    | sort -u > $(PRIVATE_INTERMEDIATES_DIR)/java-source-list-uniq

$(hide) $(TARGET_JAVAC) -encoding ascii $(PRIVATE_BOOTCLASSPATH) \

    $(addprefix -classpath ,$(strip \

        $(call normalize-path-list,$(PRIVATE_ALL_JAVA_LIBRARIES)))) \

    $(strip $(PRIVATE_JAVAC_DEBUG_FLAGS)) $(xlint_unchecked) \

    -extdirs "" -d $(PRIVATE_CLASS_INTERMEDIATES_DIR) \

    \@$(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq \

    \@$(PRIVATE_INTERMEDIATES_DIR)/java-source-list-uniq \

    || ( rm -rf $(PRIVATE_CLASS_INTERMEDIATES_DIR) ; exit 41 )

$(hide) rm -f $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list

$(hide) rm -f $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq

$(hide) rm -f $(PRIVATE_INTERMEDIATES_DIR)/java-source-list

$(hide) rm -f $(PRIVATE_INTERMEDIATES_DIR)/java-source-list-uniq

$(hide) mkdir -p $(dir $@)

$(hide) jar $(if $(strip $(PRIVATE_JAR_MANIFEST)),-cfm,-cf) \

    $@ $(PRIVATE_JAR_MANIFEST) -C $(PRIVATE_CLASS_INTERMEDIATES_DIR) .
@@ -1385,14 +1385,16 @@ $(call unzip-jar-files,$(PRIVATE_STATIC_JAVA_LIBRARIES), \ 
    $(PRIVATE_CLASS_INTERMEDIATES_DIR))

$(call dump-words-to-file,$(sort\

	$(PRIVATE_JAVA_SOURCES)),\

	$(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq)

	$(PRIVATE_INTERMEDIATES_DIR)/java-source-list-uniq)

$(hide) $(HOST_JAVAC) -encoding ascii -g \

	$(xlint_unchecked) \

	$(addprefix -classpath ,$(strip \

		$(call normalize-path-list,$(PRIVATE_ALL_JAVA_LIBRARIES)))) \

	-extdirs "" -d $(PRIVATE_CLASS_INTERMEDIATES_DIR)\

        \@$(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq || \

        \@$(PRIVATE_INTERMEDIATES_DIR)/java-source-list-uniq || \

	( rm -rf $(PRIVATE_CLASS_INTERMEDIATES_DIR) ; exit 41 )

$(hide) rm -f $(PRIVATE_INTERMEDIATES_DIR)/java-source-list

$(hide) rm -f $(PRIVATE_INTERMEDIATES_DIR)/java-source-list-uniq

$(hide) jar $(if $(strip $(PRIVATE_JAR_MANIFEST)),-cfm,-cf) \

    $@ $(PRIVATE_JAR_MANIFEST) $(PRIVATE_EXTRA_JAR_ARGS) \

    -C $(PRIVATE_CLASS_INTERMEDIATES_DIR) .