From ff2c9deb7966f79572d502a7048a3e6f0f9939b8 Mon Sep 17 00:00:00 2001
From: David 'Digit' Turner <digit@android.com>
Date: Wed, 1 Apr 2009 15:26:07 +0200
Subject: [PATCH] Ensure that /system/etc/vold.conf is created in the "generic"
 product. This is necessary to let the emulator mount SD Card images properly
 through the "vold" mounting daemon

---
 core/main.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/core/main.mk b/core/main.mk
index 37c580dea..b33a7aac4 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -209,6 +209,14 @@ ifeq (,$(filter %:system/etc/apns-conf.xml, $(PRODUCT_COPY_FILES)))
     $(warning implicitly installing apns-conf_sdk.xml)
   endif
 endif
+# Install a vold.conf file is one's not already being installed.
+ifeq (,$(filter %:system/etc/vold.conf, $(PRODUCT_COPY_FILES)))
+  PRODUCT_COPY_FILES += \
+	development/data/etc/vold.conf:system/etc/vold.conf
+  ifeq ($(filter eng tests,$(TARGET_BUILD_VARIANT)),)
+    $(warning implicitly installing vold.conf)
+  endif
+endif
 # If we're on an eng or tests build, but not on the sdk, and we have
 # a better one, use that instead.
 ifneq ($(filter eng tests,$(TARGET_BUILD_VARIANT)),)
-- 
2.11.0