commit b05fe25b9fd79cf3f7df53736da9294a008388e8
author Treehugger Robot <treehugger-gerrit@google.com> Fri Mar 24 23:10:00 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 24 23:10:02 2017 +0000
tree a297afa1f019eb50e2846bd74ed3d6e10d9fe4af
parent fd0cb496b10e61409bf18068804820da023d28b6
parent 5c8542e1b4016a4130a7142f04368e107c05272b

Merge "Fix fileslist for system other image"

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 74ffc96..5cd2fe4 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1638,7 +1638,8 @@
 	@echo Installed file list: $@
 	@mkdir -p $(dir $@)
 	@rm -f $@
-	$(hide) build/tools/fileslist.py $(TARGET_OUT_SYSTEM_OTHER) > $@
+	$(hide) build/tools/fileslist.py $(TARGET_OUT_SYSTEM_OTHER) > $(@:.txt=.json)
+	$(hide) build/tools/fileslist_util.py -c $(@:.txt=.json) > $@
 
 systemotherimage_intermediates := \
     $(call intermediates-dir-for,PACKAGING,system_other)