commit ff48993ca642cf9af822de6952541c9bdbe4e840
author Luis Hector Chavez <lhchavez@google.com> Tue Jul 03 15:41:40 2018 -0700
committer Luis Hector Chavez <lhchavez@google.com> Mon Jul 09 11:07:12 2018 -0700
tree 5f555aa5bc6c256d31012d6513a4340acc29b184
parent 674454f223f5185c2ed15ed6fd0bddda048e6469

Depend on the ramdisk/root files for BOARD_BUILD_SYSTEM_ROOT_IMAGE

When using BOARD_BUILD_SYSTEM_ROOT_IMAGE, there is no direct dependency
on the files that get typically added to the ramdisk.img apart from the
NOTICE.html dependency that some files have. This change explicitly adds
the ramdisk/root files as a dependencies of system.img so that the image
is recreated any time a file in the ramdisk changes. It also creates the
installed-files-root.txt file.

Bug: 62387674
Test: /init.rc is present in system.img's dependencies
Change-Id: I234cb8d8a648f8963610be519de1b70b7efe1fd7

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index c440f55..42e9f2c 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -1263,6 +1263,13 @@
   endif
   endif
 
+  ifeq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)
+    $(call dist-for-goals, droidcore, \
+      $(INSTALLED_FILES_FILE_ROOT) \
+      $(INSTALLED_FILES_JSON_ROOT) \
+    )
+  endif
+
   ifeq ($(EMMA_INSTRUMENT),true)
     $(JACOCO_REPORT_CLASSES_ALL) : $(INSTALLED_SYSTEMIMAGE)
     $(call dist-for-goals, dist_files, $(JACOCO_REPORT_CLASSES_ALL))