commit 49448d5bc5479dbddbc1e64c4c2be293e81457cd
author Treehugger Robot <treehugger-gerrit@google.com> Fri Dec 14 05:59:32 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 14 05:59:32 2018 +0000
tree 1cf6fe1ca1185313aeabdd5d8b5d77f2caecde03
parent 7732b434e933f9ddf0e40994ca592acbf0b6158a
parent 9eaeb56c246ac8b0ba0c305ba2e88d98d09b9225

Merge "Create directories before unzipping dexpreopt zip"

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index bb4fe0e..4eb04a6 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -4057,7 +4057,8 @@
 $(INSTALLED_SUPERIMAGE_TARGET): extracted_input_target_files := $(patsubst %.zip,%,$(BUILT_TARGET_FILES_PACKAGE))
 $(INSTALLED_SUPERIMAGE_TARGET): $(LPMAKE) $(BUILT_TARGET_FILES_PACKAGE) $(BUILD_SUPER_IMAGE)
 	$(call pretty,"Target super fs image: $@")
-	$(BUILD_SUPER_IMAGE) -v $(extracted_input_target_files) $@
+	PATH=$(dir $(LPMAKE)):$$PATH \
+	    $(BUILD_SUPER_IMAGE) -v $(extracted_input_target_files) $@
 endif
 
 $(call dist-for-goals,dist_files,$(INSTALLED_SUPERIMAGE_TARGET))
@@ -4070,9 +4071,10 @@
 	rm -rf $(intermediates)/misc_info.txt
 	$(call dump-dynamic-partitions-info,$(intermediates)/misc_info.txt)
 ifeq ($(AB_OTA_UPDATER),true)
-	$(hide) echo "ab_update=true" >> $(intermediates)/misc_info.txt
+	echo "ab_update=true" >> $(intermediates)/misc_info.txt
 endif
-	$(BUILD_SUPER_IMAGE) -v $(intermediates)/misc_info.txt $@
+	PATH=$(dir $(LPMAKE)):$$PATH \
+	    $(BUILD_SUPER_IMAGE) -v $(intermediates)/misc_info.txt $@
 
 $(call dist-for-goals,dist_files,$(INSTALLED_SUPERIMAGE_EMPTY_TARGET))