Created
December 20, 2017 09:12
-
-
Save DroidFreak32/45f1f32bfd27e6c3750fdb4facb633ea to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/core/definitions.mk b/core/definitions.mk | |
index b6869011a..441ff1005 100644 | |
--- a/core/definitions.mk | |
+++ b/core/definitions.mk | |
@@ -2188,7 +2188,7 @@ endef | |
# Call jack | |
# | |
define call-jack | |
- JACK_VERSION=$(PRIVATE_JACK_VERSION) $(JACK) $(DEFAULT_JACK_EXTRA_ARGS) | |
+ JACK_VERSION=$(PRIVATE_JACK_VERSION) flock $(BUILD_DROIDDOC) $(JACK) $(DEFAULT_JACK_EXTRA_ARGS) | |
endef | |
# Common definition to invoke javac on the host and target. | |
@@ -2329,6 +2329,7 @@ $(call call-jack) \ | |
$(if $(PRIVATE_JACK_PROGUARD_FLAGS),--config-proguard $@.flags) \ | |
$$tmpEcjArg \ | |
|| ( rm -rf $(PRIVATE_CLASSES_JACK); exit 41 ) | |
+$(hide) $(JACK)-admin server-gc | |
$(hide) mv $(PRIVATE_JACK_INTERMEDIATES_DIR)/classes*.dex $(dir $@) | |
$(hide) rm -f $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list | |
$(if $(PRIVATE_EXTRA_JAR_ARGS),$(hide) rm -rf $@.res.tmp) | |
@@ -2372,6 +2373,7 @@ $(hide) if [ -s $@.java-source-list-uniq ] ; then \ | |
$(if $(PRIVATE_JACK_INCREMENTAL_DIR),--incremental-folder $(PRIVATE_JACK_INCREMENTAL_DIR)) \ | |
@$@.java-source-list-uniq; \ | |
fi | |
+$(hide) $(JACK)-admin server-gc | |
touch $@ | |
endef | |
@@ -2391,6 +2393,7 @@ define transform-jar-to-jack | |
--import $< \ | |
--import-resource $@.tmpjill.res \ | |
--output-jack $@ | |
+ $(hide) $(JACK)-admin server-gc | |
$(hide) rm -rf $@.tmpjill.res | |
endef | |
@@ -2509,6 +2512,7 @@ $(call call-jack) \ | |
$(if $(PRIVATE_JACK_PROGUARD_FLAGS),--config-proguard $@.flags) \ | |
$$tmpEcjArg \ | |
|| ( rm -f $@ ; exit 41 ) | |
+$(hide) $(JACK)-admin server-gc | |
$(hide) rm -f $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list | |
$(if $(PRIVATE_EXTRA_JAR_ARGS),$(hide) rm -rf $@.res.tmp) | |
$(hide) mv $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list-uniq $(PRIVATE_JACK_INTERMEDIATES_DIR).java-source-list | |
diff --git a/core/droiddoc.mk b/core/droiddoc.mk | |
index 2285b2cba..cc1be399e 100644 | |
--- a/core/droiddoc.mk | |
+++ b/core/droiddoc.mk | |
@@ -173,6 +173,7 @@ $(full_target): \ | |
$(call prepare-doc-source-list,$(PRIVATE_SRC_LIST_FILE),$(PRIVATE_JAVA_FILES), \ | |
$(PRIVATE_SOURCE_INTERMEDIATES_DIR) $(PRIVATE_ADDITIONAL_JAVA_DIR)) | |
$(hide) ( \ | |
+ flock $(BUILD_DROIDDOC) \ | |
javadoc \ | |
-encoding UTF-8 \ | |
\@$(PRIVATE_SRC_LIST_FILE) \ | |
@@ -210,6 +211,7 @@ $(full_target): $(full_src_files) $(full_java_lib_deps) | |
$(call prepare-doc-source-list,$(PRIVATE_SRC_LIST_FILE),$(PRIVATE_JAVA_FILES), \ | |
$(PRIVATE_SOURCE_INTERMEDIATES_DIR) $(PRIVATE_ADDITIONAL_JAVA_DIR)) | |
$(hide) ( \ | |
+ flock $(BUILD_DROIDDOC) \ | |
javadoc \ | |
-encoding UTF-8 \ | |
$(PRIVATE_DROIDDOC_OPTIONS) \ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment