From 2359b3c1621ff9af7fe2fb3d7f0707ef2efe2440 Mon Sep 17 00:00:00 2001
From: Ying Wang <wangying@google.com>
Date: Sat, 14 Jun 2014 09:11:02 -0700
Subject: [PATCH] Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH changed.

(cherry picked from commit 7011a85606bfdeefbd5f8db668c69b61e8d612a5)

Change-Id: I025fe1f64c87fd406b3a3bf3d20fd3b78be8a940
---
 rootdir/Android.mk | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index 2c1608442..aca08bfdf 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -30,9 +30,17 @@ LOCAL_POST_INSTALL_CMD := mkdir -p $(addprefix $(TARGET_ROOT_OUT)/, \
 
 include $(BUILD_SYSTEM)/base_rules.mk
 
-$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/init.environ.rc.in
+# Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH has changed.
+bcp_md5 := $(word 1, $(shell echo $(PRODUCT_BOOTCLASSPATH) | $(MD5SUM)))
+bcp_dep := $(intermediates)/$(bcp_md5).bcp.dep
+$(bcp_dep) :
+	$(hide) mkdir -p $(dir $@) && rm -rf $(dir $@)*.bcp.dep && touch $@
+
+$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/init.environ.rc.in $(bcp_dep)
 	@echo "Generate: $< -> $@"
 	@mkdir -p $(dir $@)
 	$(hide) sed -e 's?%BOOTCLASSPATH%?$(PRODUCT_BOOTCLASSPATH)?g' $< >$@
 
+bcp_md5 :=
+bcp_dep :=
 #######################################