commit 184e605a960752fb08150cdf2ae0240aff0e9669
author Alex Van Damme <atv@google.com> Mon Aug 06 20:31:47 2018 +0000
committer Alex Van Damme <atv@google.com> Mon Aug 06 20:31:56 2018 +0000
tree f42e0990c8e10a048fc1645d5e50555ad57e2244
parent 65395704641fa606eb5ced91a373bb0ca0a1467d

Revert "Move rootfs.raw.img to cache"

This reverts commit 3ae488b1ce138dff9cc475d544fb3b33d249a40c.

Reason for revert: Broken builds

Change-Id: I027309359872543759361a2abe27bad6a9689aaa

rootfs.mk

diff --git a/rootfs.mk b/rootfs.mk
index 2c7d1a1..3aee89a 100644
--- a/rootfs.mk
+++ b/rootfs.mk
@@ -5,7 +5,7 @@
 include $(ROOTDIR)/build/preamble.mk
 
 ROOTFS_DIR := $(PRODUCT_OUT)/obj/ROOTFS/rootfs
-ROOTFS_RAW_IMG := $(ROOTDIR)/cache/rootfs.raw.img
+ROOTFS_RAW_IMG := $(PRODUCT_OUT)/obj/ROOTFS/rootfs.raw.img
 ROOTFS_PATCHED_IMG := $(PRODUCT_OUT)/obj/ROOTFS/rootfs.patched.img
 
 ROOTFS_FETCH_TARBALL ?= true
@@ -91,8 +91,8 @@
                        | $(PRODUCT_OUT)/boot.img \
                          modules \
                          packages
-	mkdir -p $(ROOTFS_DIR)
 	cp -r $(ROOTFS_RAW_IMG) $(ROOTFS_PATCHED_IMG)
+	mkdir -p $(ROOTFS_DIR)
 	-sudo umount $(ROOTFS_DIR)/boot
 	-sudo umount $(ROOTFS_DIR)
 	sudo mount -o loop $(ROOTFS_PATCHED_IMG) $(ROOTFS_DIR)